Lukas Ettel 7f1aab017e Merge remote-tracking branch 'origin/master' into refactor-controllerService ...

# Conflicts:
#	src/main/java/mops/gruppen2/service/ControllerService.java

2020-03-26 14:45:43 +01:00

..

APIController.java

some uuid improvements

2020-03-24 14:12:32 +01:00

MopsController.java

set exceptions on join group

2020-03-24 15:24:24 +01:00

WebController.java

Merge remote-tracking branch 'origin/master' into refactor-controllerService

2020-03-26 14:45:43 +01:00