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

Conflicts:
	htdocs/user/class/usergroup.class.php

2021-05-17 07:29:19 +02:00

..

doc_generic_proposal_odt.modules.php

FIX #14979

2020-11-01 17:01:26 +01:00

index.html

…

pdf_azur.modules.php

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

2021-05-17 07:29:19 +02:00

pdf_cyan.modules.php

Fix #15438

2020-11-24 20:56:11 +01:00