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

Browse Source

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml

...

This commit is contained in:

Manuel Raynaud

2013-09-04 10:50:13 +02:00

parent deee59244d dffbf76cfd

commit 0efe393e3c

53 changed files with 1885 additions and 636 deletions

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

564

install/insert.sql

File diff suppressed because it is too large Load Diff