c9a1c3a019
Conflicts: src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringRunningExam.java src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java src/test/resources/application-test.properties |
||
---|---|---|
.. | ||
api | ||
oauth | ||
WebServiceSecurityConfig.java | ||
WebServiceShutdown.java | ||
WebServiceUserDetails.java |