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

Conflicts:
	templates/admin/default/admin-layout.tpl

2013-09-10 15:46:51 +02:00

..

routing

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

2013-09-10 15:46:51 +02:00

action.xml

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

2013-09-06 19:36:52 +02:00

config.xml

Merge branch 'tax'

2013-09-09 18:16:28 +02:00

routing.xml

create router for rewriting matching

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