1cbc97ef8f
Conflicts: pom.xml src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamUpdateHandler.java src/main/resources/config/ehcache.xml src/main/resources/messages.properties |
||
---|---|---|
.. | ||
ch/ethz/seb/sebserver/gui/service/session/proctoring | ||
config | ||
org/eclipse/swt/internal | ||
static | ||
.gitignore | ||
logback-spring.xml | ||
messages.properties |