src/main/java/de/thm/arsnova/dao/IDatabaseDao.java · 0c661e6c0c6d7d9c33257127ebd6d6d9003757fa · Paul-Christian Volkmer / ARSnova Backend

Merge commit 'refs/merge-requests/6' of git://scm.thm.de/arsnova/arsnova-war into merge-requests/6 · 0c661e6c

Julian Hochstetter authored 12 years ago

Conflicts:
	src/main/java/de/thm/arsnova/controller/SessionController.java
	src/main/java/de/thm/arsnova/dao/CouchDBDao.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

0c661e6c

Forked from ARSnova / ARSnova Backend

Source project has a limited visibility.