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

d4f1c0a0

Commit d4f1c0a0 authored 6 years ago by

Daniel Gerhardt

Downloads
- Plain Diff

Merge branch '2.x'

parents 8ad7cd84 e573688a

Branches

Pipeline #22674 passed with warnings with stages

in 2 minutes and 28 seconds

Changes 4
Pipelines 4

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 27 additions, 0 deletions

CHANGELOG.md
src/main/java/de/thm/arsnova/controller/v2/AuthenticationController.java 7 additions, 5 deletions

...e/thm/arsnova/controller/v2/AuthenticationController.java
src/main/resources/arsnova.properties.example 3 additions, 3 deletions

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

src/test/resources/arsnova.properties.example

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