Merge branch 'master' of github.com:thm-projects/arsnova-backend into public_pool (750bdee2) · 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

750bdee2

Commit 750bdee2 authored 10 years ago by

Daniel Vogel

Downloads
- Plain Diff

Merge branch 'master' of github.com:thm-projects/arsnova-backend into public_pool

parents 3d575316 4590d8b0

No related merge requests found

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/thm/arsnova/controller/ConfigurationController.java 6 additions, 0 deletions

...va/de/thm/arsnova/controller/ConfigurationController.java
src/main/java/de/thm/arsnova/dao/NovaView.java 20 additions, 0 deletions

src/main/java/de/thm/arsnova/dao/NovaView.java
src/main/java/de/thm/arsnova/services/QuestionService.java 8 additions, 1 deletion

src/main/java/de/thm/arsnova/services/QuestionService.java
src/main/resources/arsnova.properties.example 28 additions, 8 deletions

src/main/resources/arsnova.properties.example
src/test/java/de/thm/arsnova/dao/NovaViewTest.java 18 additions, 2 deletions

src/test/java/de/thm/arsnova/dao/NovaViewTest.java
src/test/resources/arsnova.properties.example 32 additions, 1 deletion

src/test/resources/arsnova.properties.example

with 112 additions and 12 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