Merge branch 'master' of git.thm.de:arsnova/arsnova-backend into feature_session_info (b4bd4751) · Commits · Paul-Christian Volkmer / ARSnova Backend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

b4bd4751

Commit b4bd4751 authored 9 years ago by

Katharina Staden

Downloads
- Plain Diff

Merge branch 'master' of git.thm.de:arsnova/arsnova-backend into feature_session_info

parents b5cda14d 771fac97

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

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

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

src/main/resources/arsnova.properties.example
src/test/resources/arsnova.properties.example 0 additions, 4 deletions

src/test/resources/arsnova.properties.example

with 0 additions and 20 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