Manuel Raynaud 3f405d1ce9 Merge branch 'master' of github.com:thelia/thelia ...

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

2013-09-04 17:57:41 +02:00

..

routing

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

2013-09-04 17:57:41 +02:00

action.xml

validate create and update address in front context

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

config.xml

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

2013-09-04 17:57:41 +02:00

routing.xml

create install router

2013-09-02 16:59:10 +02:00