Skip to content
Snippets Groups Projects
Commit 187410a0 authored by Christoph Thelen's avatar Christoph Thelen
Browse files

Merge branch 'master' into issue-6674 

Conflicts:
	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/IQuestionService.java
	src/main/java/de/thm/arsnova/services/QuestionService.java
	src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
parents 9c64c3af 2c1bd151
Hide whitespace changes
Inline Side-by-side
Showing
with 120 additions and 5 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment