Laurent Destailleur e5513cff91 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ...

Conflicts:
	htdocs/accountancy/journal/bankjournal.php

2017-07-15 21:24:21 +02:00

..

index.html

…

supplier_proposal.class.php

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0

2017-07-15 21:24:21 +02:00