39e8846f64
Conflicts: src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamJITSIProctoringService.java |
||
---|---|---|
.. | ||
datalayer/batis | ||
servicelayer | ||
weblayer | ||
AdminUserInitializer.java | ||
CacheConfig.java | ||
WebserviceConfig.java | ||
WebserviceInfo.java | ||
WebserviceInit.java |