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

Merge branch 'optim' of https://github.com/thelia/thelia into optim

Browse Source 
Conflicts:
	core/lib/Thelia/Action/Order.php
	core/lib/Thelia/Core/Template/Element/BaseLoop.php
This commit is contained in:
Franck Allimant
2014-01-31 15:49:59 +01:00
parent f8460901b3 cb47041e1f
commit b7c076445c
353 changed files with 5389 additions and 3089 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -29,3 +29,4 @@ phpmyadmin
templates/default-esi
local/modules/TemplateEsiModule
composer.phar
web/.htaccess