Laurent Destailleur 69cd7ae2ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/don/card.php
	htdocs/public/test/badges.php
	htdocs/public/test/test_exec.php

2021-12-08 18:27:03 +01:00

..

index.php

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

2021-12-08 18:27:03 +01:00