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

Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/societe/consumption.php

2021-05-06 17:07:44 +02:00

..

api_users.class.php

Fix code not reachable

2021-05-04 01:10:53 +02:00

user.class.php

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

2021-05-06 17:07:44 +02:00

userbankaccount.class.php

Fix yogosha #5627

2021-03-14 11:48:39 +01:00

usergroup.class.php

Fix protect sql

2021-04-24 20:18:11 +02:00