Manuel Raynaud 9d794e229d Merge branch 'master' into module_management ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/TaxRuleCountry.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php

2013-10-21 09:19:08 +02:00

..

config

validate country creation

2013-10-07 12:46:40 +02:00

media

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

modules

Merge branch 'master' into module_management

2013-10-21 09:19:08 +02:00

session

set execution right // no more troubles

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

.gitkeep

set execution right // no more troubles

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