anhefti 36f546960b Merge remote-tracking branch 'origin/dev-1.2' into development ... Conflicts: src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java src/main/java/ch/ethz/seb/sebserver/gui/content/ExamProctoringSettings.java		2021-09-08 16:10:36 +02:00
..
api	Merge remote-tracking branch 'origin/dev-1.2' into development	2021-09-08 16:10:36 +02:00
oauth	update Spring Boot version to 2.3.0.RELEASE	2021-02-02 17:58:40 +01:00
WebServiceSecurityConfig.java	update Spring Boot version to 2.3.0.RELEASE	2021-02-02 17:58:40 +01:00
WebServiceShutdown.java	code cleanup	2020-02-20 16:12:04 +01:00
WebServiceUserDetails.java	SEBSERV-62 controller implementation and prepare for testing	2019-07-02 15:30:24 +02:00