Commit 66c304ff authored by Gregory Roussac's avatar Gregory Roussac

Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6

parents 3a714f62 6632b070
Subproject commit 57b631cc05c94f59ec5de1b09429ca2c23a75b10
Subproject commit f23ca32049ea43a60156e5981e91fbb77c0392f1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment