Regis Houssin 8953a3ed73 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ...

develop_mc

Conflicts:
	ChangeLog

2018-12-03 08:46:03 +01:00

..

cpaiement.class.php

Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose

2018-10-24 23:04:26 +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

paiement.class.php

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

2018-12-03 08:46:03 +01:00