Skip to content
GitLab
Explore
Sign in
arsnova-backend
pom.xml
Find file
Blame
History
Permalink
Merge branch 'master' into ldap_integration
· 2b4e73c5
Daniel Gerhardt
authored
Feb 28, 2014
Conflicts: pom.xml
2b4e73c5