Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

This commit is contained in:
gRoussac committed 2013-03-01 17:18:07 +01:00
commit 42bb2a506c
8 files changed
+42 -21

No files matched your search

@@ -280,6 +280,7 @@
{
"action":"UpdateProductImageShopAsso",
"id_image":id,
"id_product":id_product,
"id_shop": id_shop,
"active":active,
"token" : "{/literal}{$token}{literal}",