Merge branch '2.1' into 2.2 (f754116a) · 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

f754116a

Commit f754116a authored 8 years ago by

Daniel Gerhardt

Downloads
- Plain Diff

Merge branch '2.1' into 2.2

parents be8d4543 fe8bcd91

Branches

Tags

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 15 additions, 0 deletions

CHANGELOG.md
src/main/java/de/thm/arsnova/controller/UserController.java 1 addition, 1 deletion

src/main/java/de/thm/arsnova/controller/UserController.java
src/main/java/de/thm/arsnova/services/UserService.java 1 addition, 1 deletion

src/main/java/de/thm/arsnova/services/UserService.java

with 17 additions and 2 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