gemeinsamforschen/src/main/webapp/pages/overview-docent.html.orig · 56d376657522ec3e88250b0cda621ddd5663ff0a · fides / fltrail

6 years ago

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

Axel authored 6 years ago

# 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

83cbbd7e

History

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

Axel authored 6 years ago

# 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