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

develop_dict

Conflicts:
	htdocs/compta/charges/index.php
	htdocs/compta/paiement/list.php
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql

2017-08-22 18:49:40 +02:00

..

index.html

…

pdf_paiement_fourn.class.php

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

2017-08-22 18:49:40 +02:00

pdf_paiement.class.php

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

2017-08-22 18:49:40 +02:00