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

..

DIGenerator.php

Fix source header alignment

2013-07-17 15:06:53 +02:00

Redirect.php

apply cs-fixer

2013-08-14 09:29:04 +02:00

URL.php

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

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