Marcos García de La Fuente b822a1e3ad Merge branch 'develop' into commercial-name ...

Conflicts:
	htdocs/societe/class/societe.class.php

2015-03-15 18:20:17 +01:00

..

index.html

…

pdf_typhon.modules.php

Merge branch 'develop' into commercial-name

2015-03-15 18:20:17 +01:00