anhefti 6fc54e5310 Merge remote-tracking branch 'origin/dev-1.2' into development ... Conflicts: src/main/java/ch/ethz/seb/sebserver/gui/content/ExamDeletePopup.java src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/EntityController.java		2021-09-22 17:07:24 +02:00
..
ch/ethz/seb/sebserver	Merge remote-tracking branch 'origin/dev-1.2' into development	2021-09-22 17:07:24 +02:00