seb-server/src
anhefti 22c0dd872d Merge remote-tracking branch 'origin/dev-1.3' into development
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/ExamAdminServiceImpl.java
2022-06-13 10:23:26 +02:00
..
main Merge remote-tracking branch 'origin/dev-1.3' into development 2022-06-13 10:23:26 +02:00
test SEBSERV-308 added archived state 2022-05-23 14:42:20 +02:00