Laurent Destailleur a4665e17d4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/customer/index.php htdocs/accountancy/expensereport/index.php htdocs/compta/facture/class/facture-rec.class.php htdocs/fichinter/class/fichinter.class.php htdocs/societe/class/societe.class.php htdocs/societe/list.php		2017-09-12 13:26:25 +02:00
..
fichinter.class.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-12 13:26:25 +02:00
fichinterstats.class.php	Finish work "Can filter on status on objects on the "statistics" pages"	2016-12-16 01:26:01 +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