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

..

card.php

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

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

index.php

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00