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

Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/societe/consumption.php
	htdocs/user/class/user.class.php

2021-05-06 16:57:49 +02:00

..

api_users.class.php

Fix duplicate permissions

2021-04-09 21:15:43 +02:00

index.html

…

user.class.php

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

2021-05-06 16:57:49 +02:00

userbankaccount.class.php

Scrutinizer Auto-Fixes

2020-10-31 13:32:18 +00:00

usergroup.class.php

fix: update group name

2021-01-11 19:40:44 +01:00