Manuel Raynaud 6fef556319 Merge branch 'propel' ...

Conflicts:
	install/thelia.sql

2013-10-22 14:48:10 +02:00

..

lib/Thelia

Merge branch 'propel'

2013-10-22 14:48:10 +02:00

bootstrap.php

complete invoice pdf template

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