Merge branch 'master' into frontend

Conflicts: core/lib/Thelia/Controller/Admin/OrderController.php
2013-11-12 11:09:55 +01:00
parent 1619ad4a80 3ca3b4521b
commit d1b897a254
62 changed files with 1649 additions and 1700 deletions
--- a/templates/default/assets/less/styles.less
+++ b/templates/default/assets/less/styles.less
@@ -1,4 +1,3 @@
-
 /* Bootstrap */
@import "bootstrap/bootstrap.less";

@@ -9,4 +8,4 @@
@import "thelia/import.less";

 /* Theme */
-@import "../themes/default/less/import.less";
+@import "../themes/default/less/import.less";