eleijonmarck 29adcd4e48 Command: add conflict merge user command ...

- MergeUser will
	- replace all user_ids from conflicting users to the chosen userId
	- delete users whose user_ids are not the chosen user
- SameIdentification will
	- update chosen user with chosen email,login details
	- delete users whose user_ids are not the chosen user

2022-07-20 14:02:15 +01:00

..

grafana-cli

Command: add conflict merge user command

2022-07-20 14:02:15 +01:00

grafana-server

remove the global log error/warn etc functions (#41404)

2021-11-08 17:56:56 +01:00