Manuel Raynaud d6e26e428e Merge branch 'master' into frontend ...

Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
	templates/admin/default/tax-rule-edit.html
	templates/admin/default/taxes-rules.html

2013-10-18 16:41:39 +02:00

..

lib/Thelia

Merge branch 'master' into frontend

2013-10-18 16:41:39 +02:00

bootstrap.php

complete invoice pdf template

2013-10-02 18:03:25 +02:00