Files
dolibarr/htdocs/modulebuilder/template/admin
Laurent Destailleur 0f5fc7353e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/admin/mailing.php
	htdocs/admin/paymentbybanktransfer.php
	htdocs/admin/prelevement.php
	htdocs/modulebuilder/template/admin/setup.php
2021-01-24 15:29:53 +01:00
..
2021-01-06 20:16:43 +01:00