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

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

2013-09-06 17:48:12 +02:00

..

routing

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

2013-09-06 17:48:12 +02:00

action.xml

validate create and update address in front context

2013-09-04 17:52:58 +02:00

config.xml

Continuing categories administration...

2013-09-06 17:46:40 +02:00

routing.xml

create router for rewriting matching

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