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

..

routing

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

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

action.xml

Finished Features management

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

config.xml

Finished Features management

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

routing.xml

create router for rewriting matching

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