anhefti 0bda2cb292 Merge remote-tracking branch 'origin/dev-1.1-patch-1' into development ... Conflicts: src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientInstruction.java src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamProctoringController.java		2021-05-12 17:37:08 +02:00
..
ch/ethz/seb/sebserver	Merge remote-tracking branch 'origin/dev-1.1-patch-1' into development	2021-05-12 17:37:08 +02:00