Merge remote-tracking branch 'origin/master' (a2ff2079) · Commits · ARSnova / ARSnova Backend

There was an error fetching the commit references. Please try again later.

Commit a2ff2079 authored 12 years ago by

Christoph Thelen

Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/de/thm/arsnova/controller/QuestionController.java
	src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
	src/main/java/de/thm/arsnova/services/QuestionService.java

parents 717a5bb5 92ede846

Hide whitespace changes

Inline Side-by-side

Showing with 19 additions and 4 deletions

Please register or to comment