killerber4t d2b5b44a0d Merge remote-tracking branch 'origin/master' into max_userNumber ...

# Conflicts:
#	src/main/resources/templates/editMembers.html

2020-03-19 15:55:59 +01:00

..

APIController.java

Intellij Code Cleaunp

2020-03-18 23:25:54 +01:00

Gruppen2Controller.java

Merge remote-tracking branch 'origin/master' into max_userNumber

2020-03-19 15:55:59 +01:00

MopsController.java

fix rename errors

2020-03-19 00:20:14 +01:00