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

Merge branch '2.0' 

Conflicts:
	pom.xml
	src/main/resources/log4j.properties
parents d5e80d05 dd03cbf0
Hide whitespace changes
Inline Side-by-side
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