Laurent Destailleur 78b0585798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/taxes.php		2018-03-12 19:09:57 +01:00
..
contact.class.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-12 19:09:57 +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