Skip to content
Snippets Groups Projects
Select Git revision
0 results
Blame History Permalink
  • Julian Hochstetter's avatar
    Merge branch 'master' of gitorious@scm.thm.de:arsnova/arsnova-war.git · 986ede41
    Julian Hochstetter authored 
    Conflicts:
	src/main/java/de/thm/arsnova/controller/QuestionController.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/entities/Question.java
	src/main/java/de/thm/arsnova/entities/User.java
	src/main/java/de/thm/arsnova/services/IQuestionService.java
	src/test/java/de/thm/arsnova/controller/LoginControllerTest.java
    986ede41
Forked from ARSnova / ARSnova Backend
Source project has a limited visibility.