Laurent Destailleur 843e0a2c39 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/card.php htdocs/core/class/html.formother.class.php htdocs/core/modules/societe/doc/doc_generic_odt.modules.php htdocs/projet/tasks/time.php htdocs/webservices/server_thirdparty.php		2021-03-29 21:47:31 +02:00
..
doc_generic_odt.modules.php	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-03-29 21:47:31 +02:00
index.html