Etienne Roudeix abe45c5798 Merge branch 'master' into tax ...

Conflicts:
	core/lib/Thelia/Config/Resources/action.xml
	core/lib/Thelia/Controller/Admin/AddressController.php
	core/lib/Thelia/Controller/Admin/CustomerController.php
	core/lib/Thelia/Controller/Admin/ModuleController.php

2013-10-21 17:48:13 +02:00

..

admin/default

Merge branch 'master' into tax

2013-10-21 17:48:13 +02:00

default

fix typo in product breadcrumb

2013-10-21 14:28:03 +02:00

pdf

create purchase order pdf

2013-10-03 10:45:21 +02:00

.gitkeep

set execution right // no more troubles

2013-06-20 15:21:16 +02:00