Laurent Destailleur b1c2198154 Merge remote-tracking branch 'origin/3.9' into develop ...

Conflicts:
	htdocs/core/ajax/selectsearchbox.php
	htdocs/core/lib/price.lib.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFacture.class.php
	htdocs/projet/list.php
	htdocs/societe/list.php

2016-04-07 20:01:52 +02:00

..

contrat.class.php

Merge remote-tracking branch 'origin/3.9' into develop

2016-04-07 20:01:52 +02:00

index.html

readd index.html file

2015-02-02 11:13:11 +01:00