Etienne Roudeix dffbf76cfd Merge branch 'master' into rewrite ...

Conflicts:
	core/lib/Thelia/Controller/BaseController.php
	install/insert.sql

2013-09-04 10:06:22 +02:00

..

Admin

Fixed minor bug in Currencies

2013-09-03 19:32:57 +02:00

Front

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

2013-09-03 19:03:27 +02:00

BaseController.php

Merge branch 'master' into rewrite

2013-09-04 10:06:22 +02:00

NullControllerInterface.php

set execution right // no more troubles

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