Skip to content
Snippets Groups Projects
Select Git revision
20 results
Blame History Permalink
  • Daniel Gerhardt's avatar
    Merge branch '2.1' · 1602d355
    Daniel Gerhardt authored 
    Conflicts:
	pom.xml
	src/main/java/de/thm/arsnova/controller/SessionController.java
	src/main/resources/log4j-dev.properties
    1602d355