anhefti 9896258afc Merge remote-tracking branch 'origin/dev-1.2' into development ... Conflicts: src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java src/main/java/ch/ethz/seb/sebserver/gui/content/ProctorRoomConnectionsPopup.java src/main/java/ch/ethz/seb/sebserver/gui/content/SEBClientEvents.java src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ClientEventController.java		2021-11-10 13:25:26 +01:00
..
seb/sebserver	Merge remote-tracking branch 'origin/dev-1.2' into development	2021-11-10 13:25:26 +01:00