Skip to content
Snippets Groups Projects
Commit 81fa316d authored by Johannes Zeiße's avatar Johannes Zeiße
Browse files

Merge remote-tracking branch 'origin/development_master' into development_master

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
parents 7ac7a601 69077abf
No related branches found
No related tags found
No related merge requests found
Showing
with 401 additions and 80 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment