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

..

Cheque

end module activation

2013-10-18 10:06:42 +02:00

Colissimo

process module toggle activation

2013-10-17 18:50:00 +02:00

FakeCB

process module toggle activation

2013-10-17 18:50:00 +02:00

TheliaDebugBar

Merge branch 'master' into module_management

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

.gitkeep

set execution right // no more troubles

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