Franck Allimant 5bf51dd47e Merge branch 'catalog' ...

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

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

..

admin/default

Merge branch 'catalog'

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

default

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

2013-10-22 23:01:04 +02:00

pdf

create purchase order pdf

2013-10-03 10:45:21 +02:00

.gitkeep

set execution right // no more troubles

2013-06-20 15:21:16 +02:00