Merge branch '2.x' (6f825c10) · 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

6f825c10

Commit 6f825c10 authored 6 years ago by

Daniel Gerhardt

Downloads
- Plain Diff

Merge branch '2.x'

parents fa3cfc71 8bd7f582

Branches

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 12 additions, 0 deletions

CHANGELOG.md
pom.xml 5 additions, 4 deletions

pom.xml
src/main/java/de/thm/arsnova/controller/v2/RoomController.java 9 additions, 0 deletions

...ain/java/de/thm/arsnova/controller/v2/RoomController.java
src/main/java/de/thm/arsnova/model/migration/v2/LoggedIn.java 11 additions, 0 deletions

...main/java/de/thm/arsnova/model/migration/v2/LoggedIn.java
src/main/java/de/thm/arsnova/model/transport/ImportExportContainer.java 6 additions, 8 deletions

...de/thm/arsnova/model/transport/ImportExportContainer.java
src/main/resources/arsnova.properties.example 3 additions, 0 deletions

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

src/test/resources/arsnova.properties.example

with 49 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