anhefti 3b1641994a Merge remote-tracking branch 'origin/patch-1.0.2' into development ... Conflicts: src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringRunningExam.java		2020-11-17 17:29:06 +01:00
..
ch/ethz/seb/sebserver	Merge remote-tracking branch 'origin/patch-1.0.2' into development	2020-11-17 17:29:06 +01:00