Merge branch 'frontend' of github.com:thelia/thelia into frontend

2013-10-22 10:24:03 +02:00
parent b99f24c072 945471dd8a
commit dbcfd8965f
252 changed files with 9365 additions and 8143 deletions
--- a/templates/default/category.html
+++ b/templates/default/category.html
@@ -47,6 +47,4 @@
        </aside>

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