Merge remote-tracking branch 'origin/master' (0b0ed384) · 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

0b0ed384

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

Commit 0b0ed384 authored 10 years ago by

Christoph Thelen

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master'

parents 67c6ba0d 8ea8e1d5

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/thm/arsnova/controller/ConfigurationController.java 7 additions, 1 deletion

...va/de/thm/arsnova/controller/ConfigurationController.java
src/main/resources/arsnova.properties.example 1 addition, 0 deletions

src/main/resources/arsnova.properties.example
src/test/resources/arsnova.properties.example 1 addition, 0 deletions

src/test/resources/arsnova.properties.example

with 9 additions and 1 deletion

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