Skip to content
Snippets Groups Projects
Commit 1602d355 authored by Daniel Gerhardt's avatar Daniel Gerhardt
Browse files

Merge branch '2.1' 

Conflicts:
	pom.xml
	src/main/java/de/thm/arsnova/controller/SessionController.java
	src/main/resources/log4j-dev.properties
parents 9294184b c2280541
Branches
Tags
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 73 additions and 43 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment