Regis Houssin 8b0354cfdf Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/compta/paiement/class/paiement.class.php htdocs/install/mysql/migration/5.0.0-6.0.0.sql		2017-06-11 16:43:31 +02:00
..
cpaiement.class.php	Clean dead code	2017-01-03 11:22:03 +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 'develop' of https://github.com/Dolibarr/dolibarr.git into	2017-06-11 16:43:31 +02:00