[Mahgs] 60837d8cf3 Merge remote-tracking branch 'origin/master' into showInviteLink ...

# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/service/GroupService.java

2020-03-24 14:51:33 +01:00

..

mops/gruppen2

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

2020-03-24 14:51:33 +01:00