Skip to content
Snippets Groups Projects
Commit 83cbbd7e authored by Axel's avatar Axel
Browse files

Merge branch 'development_master' of https://github.com/juliandehne/fltrail into development_master 

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/UserService.java
#	gemeinsamforschen/src/main/webapp/pages/overview-docent.html
#	gemeinsamforschen/src/main/webapp/pages/overview-student.html
parents 101938cc 9bbae0ff
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 676 additions and 74 deletions
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