Merge branch 'master' of github.com:thelia/thelia

2013-07-08 09:25:56 +02:00
parent 7d3d36231f ddc6d02f80
commit 6fa6756000
52 changed files with 1844 additions and 69 deletions
--- a/composer.json
+++ b/composer.json
@@ -27,8 +27,6 @@

        "symfony/form": "2.2.*",
        "symfony/validator": "2.2.*",
-        "symfony/security": "2.2.*",
-        "symfony/templating": "2.2.*",

        "smarty/smarty": "v3.1.13",
        "kriswallsmith/assetic": "1.2.*@dev",