anhefti 9a00e9c1ab 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/gui/content/MonitoringRunningExam.java		2021-09-20 16:20:54 +02:00
..
examconfig	Merge remote-tracking branch 'origin/dev-1.2' into development	2021-08-30 13:14:16 +02:00
i18n	SEBSERV-148 GUI Exam Config impl	2021-04-06 18:44:36 +02:00
page	Merge branch 'dev-1.2' into development	2021-08-10 09:42:25 +02:00
push	fixed notification changes in GUI	2021-09-20 15:46:20 +02:00
remote	SEBSERV-162 create exam from template and tests	2021-09-15 15:51:02 +02:00
session	Merge remote-tracking branch 'origin/dev-1.2' into development	2021-09-20 16:20:54 +02:00
ResourceService.java	SEBSERV-162 create exam from template and tests	2021-09-15 15:51:02 +02:00