anhefti facbef66ca Merge branch 'dev-1.2-SEBSERV-234' into development ... Conflicts: src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamDAOImpl.java src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionServiceImpl.java		2022-01-26 15:11:58 +01:00
..
java/ch/ethz/seb/sebserver	Merge branch 'dev-1.2-SEBSERV-234' into development	2022-01-26 15:11:58 +01:00
resources	SEBSERV-260 new ARCHIVED state for exam configurations	2022-01-26 12:05:38 +01:00