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

Merge branch '2.0'

Conflicts:
	pom.xml
parents 4875ccba 9df07fd8
No related merge requests found
Showing
No files found.
with 0 additions and 0 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