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

Browse Source

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml

...

This commit is contained in:

franck

2013-08-08 11:15:01 +02:00

parent 4e83466bc0 1a81dad90d

commit 2bb98352be

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available