Merge branch 'master' into question-api-rewrite (7e537170) · Commits · ARSnova / ARSnova Backend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

ARSnova Backend
- Activity
- Members
- Labels
- Releases
- Environments
- Incidents

Snippets Groups Projects

7e537170

Commit 7e537170 authored 12 years ago by

Daniel Gerhardt

Downloads
- Plain Diff

Merge branch 'master' into question-api-rewrite

Conflicts:
	src/main/java/de/thm/arsnova/controller/QuestionByLecturerController.java

parents 5aeba011 ca0226df

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 2 additions, 2 deletions

pom.xml
src/main/java/de/thm/arsnova/controller/QuestionByLecturerController.java 49 additions, 0 deletions

.../thm/arsnova/controller/QuestionByLecturerController.java
src/main/java/de/thm/arsnova/dao/CouchDBDao.java 9 additions, 8 deletions

src/main/java/de/thm/arsnova/dao/CouchDBDao.java
src/main/java/de/thm/arsnova/entities/Question.java 9 additions, 0 deletions

src/main/java/de/thm/arsnova/entities/Question.java
src/main/webapp/WEB-INF/web.xml 2 additions, 1 deletion

src/main/webapp/WEB-INF/web.xml

with 71 additions and 11 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment