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

..

assets/images/sources

Merge branch 'master' into loops

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

AddressTest.php

add update address action and create tests

2013-09-04 10:09:51 +02:00

ImageTest.php

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

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