Laurent Destailleur e3126ec999 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ...

Conflicts:
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/multicurrency/class/multicurrency.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php

2020-07-25 00:22:47 +02:00

..

multicurrency.class.php

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0

2020-07-25 00:22:47 +02:00