Merge branch 'master' into modules

Conflicts: templates/backOffice/default/product-edit.html
2013-12-17 10:48:59 +01:00
parent 65f43b5eff e5576864cd
commit 0c24a8afc0
121 changed files with 4530 additions and 2203 deletions
--- a/templates/backOffice/default/modules.html
+++ b/templates/backOffice/default/modules.html
@@ -140,4 +140,8 @@

        });
    </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='modules-js'}
 {/block}