Merge branch 'http_caching' of github.com:thelia/thelia into http_caching

Browse Source

Conflicts:
	core/lib/Thelia/Core/TheliaHttpKernel.php

...

This commit is contained in:

Manuel Raynaud

2013-11-20 14:46:47 +01:00

parent 4109de0d9c a52873a731

commit bdc49ade98

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