touffies 9d5aa5e077 Merge branch 'master' into frontend ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml

2013-10-22 11:55:58 +02:00

..

lib/Thelia

Merge branch 'master' into frontend

2013-10-22 11:55:58 +02:00

bootstrap.php

complete invoice pdf template

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