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

Conflicts:
	htdocs/core/tpl/admin_extrafields_add.tpl.php
	htdocs/main.inc.php

2016-10-11 12:35:14 +02:00

..

contrat.class.php

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

2016-10-11 12:35:14 +02:00

index.html

readd index.html file

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