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

Merge branch '2.1' 

Conflicts:
	pom.xml
parents ec7b9b04 98b6f6d7
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 6 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