Laurent Destailleur d3ece31969 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/user/class/api_users.class.php		2021-05-17 19:29:03 +02:00
..
api_users.class.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-05-17 19:29:03 +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
usergroup.class.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-05-17 07:33:28 +02:00