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

Merge branch 'SortierbareFragenliste-final' of swtp2015-text-checker-arsnova-backend

Conflicts:
	pom.xml
	src/main/java/de/thm/arsnova/dao/CouchDBDao.java
	src/main/java/de/thm/arsnova/services/IQuestionService.java
	src/main/java/de/thm/arsnova/services/QuestionService.java
parents 29e9221e a0a9612e
No related merge requests found
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