Skip to content
Snippets Groups Projects
Commit a82e904e authored by Julian Hochstetter's avatar Julian Hochstetter
Browse files

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

Conflicts:
	src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
parents 6f59f78e 7bfe28d0
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment