Laurent Destailleur 81a3235cf6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/expensereport/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/facture/list.php

2016-12-03 16:01:18 +01:00

..

cron.php

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop

2016-12-03 16:01:18 +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