Laurent Destailleur 8fd082cf16 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/hrm/hrm.php

2016-08-31 16:16:19 +02:00

..

contrat.class.php

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

2016-08-31 16:16:19 +02:00

index.html

readd index.html file

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