Skip to content
Snippets Groups Projects
  1. Feb 24, 2015
  2. Feb 19, 2015
  3. Feb 17, 2015
  4. Feb 16, 2015
  5. Feb 12, 2015
  6. Feb 11, 2015
  7. Feb 10, 2015
    • 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