Merge branch 'master' of scm.thm.de:arsnova/arsnova-war (06595784) · 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

06595784

Commit 06595784 authored 12 years ago by

Julian Hochstetter

Downloads
- Plain Diff

Merge branch 'master' of scm.thm.de:arsnova/arsnova-war

Conflicts:
	src/main/java/de/thm/arsnova/services/SessionService.java

parents bdf4b9e7 1ae9c803

Branches

Tags

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/thm/arsnova/services/ISessionService.java 1 addition, 0 deletions

src/main/java/de/thm/arsnova/services/ISessionService.java
src/main/java/de/thm/arsnova/services/SessionService.java 140 additions, 18 deletions

src/main/java/de/thm/arsnova/services/SessionService.java
src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java 99 additions, 0 deletions

...ain/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
src/main/webapp/WEB-INF/api-servlet.xml 4 additions, 1 deletion

src/main/webapp/WEB-INF/api-servlet.xml

with 244 additions and 19 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