Laurent Destailleur 70091eceed Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/expensereport/card.php

2017-01-27 01:26:11 +01:00

..

contrat.class.php

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-01-27 01:26:11 +01:00

index.html

readd index.html file

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