Laurent Destailleur db9af0118c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/modAdherent.class.php		2016-12-06 14:08:43 +01:00
..
export.class.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-12-06 14:08:43 +01:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00