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

Browse Source

Conflicts:
	install/thelia.sql

...

This commit is contained in:

Franck Allimant

2014-01-27 17:42:56 +01:00

parent 3c151ac68e 056116c554

commit 4713c18eaa

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