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

Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml

2013-09-16 11:01:00 +02:00

..

Admin

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

2013-09-16 11:01:00 +02:00

Front

allow address removal from front

2013-09-13 12:33:13 +02:00

Install

First version of installation wizard

2013-09-13 18:03:45 +02:00

BaseController.php

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

2013-09-16 10:01:34 +02:00

NullControllerInterface.php

set execution right // no more troubles

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