Skip to content
GitLab
Explore
Sign in
minerva
core
Repository
core
frontend-js
src
main
js
ServerConnector.js
Find file
Blame
History
Permalink
Merge remote-tracking branch 'remotes/origin/devel_12.1.x' into 659-updateUser-fix
· 4b5a0ea8
Sascha Herzinger
authored
Feb 08, 2019
# Conflicts: # frontend-js/src/main/js/ServerConnector.js
4b5a0ea8