Merge remote-tracking branch 'upstream/master' (b5dd93c9) · 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

b5dd93c9

Commit b5dd93c9 authored 11 years ago by

Paul-Christian Volkmer

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master'

parents 11a689b2 15c04f8c

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 1 addition, 1 deletion

pom.xml
src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java 1 addition, 1 deletion

...de/thm/arsnova/controller/AudienceQuestionController.java
src/main/java/de/thm/arsnova/events/ARSnovaEvent.java 26 additions, 0 deletions

src/main/java/de/thm/arsnova/events/ARSnovaEvent.java
src/main/java/de/thm/arsnova/events/package-info.java 1 addition, 0 deletions

src/main/java/de/thm/arsnova/events/package-info.java
src/main/java/de/thm/arsnova/services/UserSessionServiceImpl.java 12 additions, 1 deletion

.../java/de/thm/arsnova/services/UserSessionServiceImpl.java
src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java 8 additions, 4 deletions

...ain/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java

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