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

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	templates/admin/default/configuration.html

2013-10-21 08:13:18 +02:00

..

admin/default

Merge branch 'master' into tax

2013-10-21 08:13:18 +02:00

default

Merge branch 'frontend' of github.com:thelia/thelia into frontend

2013-10-18 16:51:50 +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