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

58c3e5af

Commit 58c3e5af authored 12 years ago by

Paul-Christian Volkmer

Downloads
- Plain Diff

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

parents 8ea0ec79 3c37346b

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/thm/arsnova/SessionController.java 11 additions, 0 deletions

src/main/java/de/thm/arsnova/SessionController.java
src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java 11 additions, 3 deletions

...ain/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
src/main/webapp/WEB-INF/spring/spring-main.xml 1 addition, 1 deletion

src/main/webapp/WEB-INF/spring/spring-main.xml
src/main/webapp/arsnova.properties.example 4 additions, 1 deletion

src/main/webapp/arsnova.properties.example
src/test/resources/arsnova.properties.example 4 additions, 1 deletion

src/test/resources/arsnova.properties.example

with 31 additions and 6 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