Merge branch 'cleanmaster' into modules

2013-12-12 15:45:45 +01:00
parent 6acb1924d8 65df33d0b7
commit 297f197fed
19 changed files with 290 additions and 23 deletions
--- a/templates/backOffice/default/product-edit.html
+++ b/templates/backOffice/default/product-edit.html
@@ -144,6 +144,10 @@
        <script src="{$asset_url}"></script>
    {/javascripts}

+    {javascripts file='assets/js/jquery-ui-1.10.3.custom.min.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
+
 <script src="{url file='/tinymce/tinymce.min.js'}"></script>

 <script>