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

Merge branch 'admin'

Browse Source 
Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/Template/Element/BaseLoop.php
	core/lib/Thelia/Core/Template/Loop/Category.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-08 11:27:37 +02:00
parent 0b9d7d1d35 8f894382f6
commit abdff9bc1a
62 changed files with 752 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@@ -31,7 +31,9 @@
"smarty/smarty": "v3.1.13",
"kriswallsmith/assetic": "1.2.*@dev",
"leafo/lessphp": "0.3.*@dev",
"ptachoire/cssembed": "dev-master"
"ptachoire/cssembed": "dev-master",
"simplepie/simplepie": "dev-master"
},
"require-dev" : {
"fzaninotto/faker": "dev-master"