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

Conflicts:
	htdocs/societe/soc.php

2015-06-13 02:45:42 +02:00

..

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

pdf_soleil.modules.php

Merge branch 'develop' into commercial-name

2015-06-13 02:45:42 +02:00