anhefti f161587f6a Merge remote-tracking branch 'origin/dev-1.2' into development ... Conflicts: src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringClientConnection.java src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamDAOImpl.java src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionControlTask.java		2021-12-13 15:58:52 +01:00
..
ch/ethz/seb/sebserver	Merge remote-tracking branch 'origin/dev-1.2' into development	2021-12-13 15:58:52 +01:00