TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into loops

Browse Source 
Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php
	templates/smarty-sample/index.html
This commit is contained in:
Etienne Roudeix
2013-07-05 11:16:55 +02:00
parent a7a9688d41 5fbb923e40
commit 55a309c00a
670 changed files with 153101 additions and 187341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -10,7 +10,7 @@
"php": ">=5.3",
"ezyang/htmlpurifier": "dev-master",
"ircmaxell/password-compat": "dev-master",
"propel/propel1" : "1.6.*",
"propel/propel": "2.0.0-alpha1",
"psr/log" : "1.0",
"symfony/class-loader": "2.2.*",
"symfony/config" : "2.2.*",