Skip to content
Snippets Groups Projects
  • Julian Hochstetter's avatar
    Merge remote-tracking branch 'origin/master' · 8f858cf4
    Julian Hochstetter authored
    Conflicts:
    	src/main/java/de/thm/arsnova/SessionController.java
    	src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
    	src/main/java/de/thm/arsnova/services/ISessionService.java
    	src/main/java/de/thm/arsnova/services/SessionService.java
    	src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
    8f858cf4
Forked from ARSnova / ARSnova Backend
Source project has a limited visibility.