Skip to content
GitLab
Explore
Sign in
arsnova-backend
src
main
resources
log4j.properties
Find file
Blame
History
Permalink
Merge branch '2.0'
· 270f74f3
Daniel Gerhardt
authored
Jan 17, 2015
Conflicts: pom.xml src/main/resources/log4j.properties
270f74f3
Daniel Gerhardt authored