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

Merge remote-tracking branch 'origin/master' into admin

Browse Source 
Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php
This commit is contained in:
franck
2013-07-06 10:34:09 +02:00
parent 6e5b259d44 a2012259bf
commit 162084140e
609 changed files with 116620 additions and 187340 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.*",