Skip to content
GitLab
Explore
Sign in
arsnova-backend
src
main
resources
log4j.properties
Find file
Blame
History
Permalink
Merge branch 'master' of gitorious@scm.thm.de:arsnova/arsnova-war.git
· a82e904e
Julian Hochstetter
authored
Sep 12, 2012
Conflicts: src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
a82e904e
