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

Merge branch '2.0' into 2.1

Conflicts:
	pom.xml
parents 2b4d856d 22984ffb
No related merge requests found
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