Laurent Destailleur aebae5ff83 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/margins.lang htdocs/user/class/user.class.php		2019-10-10 10:37:17 +02:00
..
generate	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-10-10 10:37:17 +02: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