Skip to content
Snippets Groups Projects
Commit 4b5a0ea8 authored by Sascha Herzinger's avatar Sascha Herzinger
Browse files

Merge remote-tracking branch 'remotes/origin/devel_12.1.x' into 659-updateUser-fix 

# Conflicts:
#	frontend-js/src/main/js/ServerConnector.js
parents dda185dc 69929e66
No related branches found
No related tags found
5 merge requests!64012.1.8 into master,!639Merge 12.1.8,!638Merge 12.1.8,!637Devel 12.1.x,!636Resolve "The privileges of a new user are not saved in some cases"
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment