Merge branch 'catalog'

Browse Source

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Template/Loop/Country.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
	core/lib/Thelia/Model/Country.php
	core/lib/Thelia/Model/Profile.php
	core/lib/Thelia/Model/ProfileQuery.php
	install/insert.sql
	install/thelia.sql
	local/config/schema.xml

...

This commit is contained in:

Franck Allimant

2013-10-24 00:16:33 +02:00

parent fa99482f46 7ca2399573

commit 5bf51dd47e

38 changed files with 3324 additions and 1903 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

2506

local/config/schema.xml

File diff suppressed because it is too large Load Diff