Merge branch 'master' into issue-6674 (f437d569) · 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

f437d569

Commit f437d569 authored 11 years ago by

Christoph Thelen

Downloads
- Plain Diff

Merge branch 'master' into issue-6674

parents bc25f066 b13dc14f

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 1 addition, 0 deletions

.travis.yml
src/main/java/de/thm/arsnova/aop/UserSessionAspect.java 2 additions, 0 deletions

src/main/java/de/thm/arsnova/aop/UserSessionAspect.java
src/main/java/de/thm/arsnova/services/SessionService.java 0 additions, 1 deletion

src/main/java/de/thm/arsnova/services/SessionService.java
src/main/java/de/thm/arsnova/services/UserService.java 5 additions, 1 deletion

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

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