franck 318fb3bf2d Merge branch 'master' of https://github.com/thelia/thelia ...

Conflicts:
	templates/admin/default/currencies.html

2013-09-05 23:30:50 +02:00

..

ModelCriteriaTools.php

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

2013-08-30 19:48:26 +02:00

ModelEventDispatcherTrait.php

Before merging coupon

2013-09-05 10:00:17 +02:00

PositionManagementTrait.php

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

2013-09-05 23:30:50 +02:00