Laurent Destailleur faea6861c3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
	htdocs/langs/en_US/bills.lang

2018-04-16 18:19:21 +02:00

..

cronjob.class.php

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

2018-04-16 18:19:21 +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