Manuel Raynaud d6e1f99b35 Merge branch 'template' ...

Conflicts:
	templates/admin/default/customer-edit.html

2013-09-12 15:44:23 +02:00

..

routing

Merge branch 'template'

2013-09-12 15:44:23 +02:00

action.xml

Using "update" instead of "change"

2013-09-12 14:20:23 +02:00

config.xml

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

2013-09-12 13:04:12 +02:00

routing.xml

create router for rewriting matching

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