anhefti 6ff8b703c9 Merge remote-tracking branch 'origin/dev-1.1.0' into development ... Conflicts: src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringRunningExam.java src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/JitsiMeetProctoringView.java src/main/java/ch/ethz/seb/sebserver/gui/service/session/ProctoringGUIService.java src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/RemoteProctoringRoomDAO.java src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/RemoteProctoringRoomDAOImpl.java src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/ExamProctoringRoomService.java src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamProctoringRoomServiceImpl.java src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamProctoringController.java		2021-03-29 14:53:49 +02:00
..
ethz/seb/sebserver	Merge remote-tracking branch 'origin/dev-1.1.0' into development	2021-03-29 14:53:49 +02:00