mespeche 2a6c50c865 Merge branch 'views-management' of https://github.com/thelia/thelia into views-management ...

Conflicts:
	templates/admin/default/tax-rule-edit.html

2013-09-30 10:14:11 +02:00

..

default

Merge branch 'views-management' of https://github.com/thelia/thelia into views-management

2013-09-30 10:14:11 +02:00