Merge branch 'master' into frontend

Conflicts: core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php templates/admin/default/tax-rule-edit.html templates/admin/default/taxes-rules.html
2013-10-18 16:41:39 +02:00
parent 1ee45e0cb2 d354ed96ad
commit d6e26e428e
51 changed files with 1699 additions and 144 deletions
--- a/templates/default/category.html
+++ b/templates/default/category.html
@@ -40,6 +40,4 @@
        </aside>

    </div>
-
-    </div><!-- /.container -->
 {/block}