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

Conflicts:
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php

2021-03-29 21:39:53 +02:00

..

doc_generic_odt.modules.php

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

2021-03-29 21:39:53 +02:00

index.html

…