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

Conflicts:
	htdocs/accountancy/admin/journals_list.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/fr_FR/other.lang

2018-06-26 01:25:03 +02:00

..

cpaiement.class.php

Fix: debug

2018-03-08 11:53:46 +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

paiement.class.php

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

2018-06-26 01:25:03 +02:00