Laurent Destailleur 01914980d9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/public/notice.php

2020-06-19 00:45:06 +02:00

..

card.php

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

2020-06-19 00:45:06 +02:00

index.html

…