Manuel Raynaud 365d90b4a8 Merge branch 'master' into template ...

Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php

2013-09-16 10:19:40 +02:00

..

routing

Merge branch 'master' into template

2013-09-16 10:19:40 +02:00

action.xml

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

config.xml

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

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

routing.xml

create router for rewriting matching

2013-09-05 20:46:46 +02:00