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
..
class	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-12-06 14:08:43 +01:00
export.php	Remove call of a deprecated function	2016-10-24 11:27:39 +02:00
index.php	Revert commit that break compatibility of 100% of modules	2016-03-25 15:24:57 +01:00