touffies 9d5aa5e077 Merge branch 'master' into frontend ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml

2013-10-22 11:55:58 +02:00

..

routing

create newsletter template

2013-10-22 10:49:30 +02:00

action.xml

create newsletter listener

2013-10-22 09:48:24 +02:00

config.xml

Merge branch 'master' into frontend

2013-10-22 11:55:58 +02:00

routing.xml

add higher priority to module routing

2013-10-08 13:22:06 +02:00