Commit 3f0306c0 authored by Benjamin Beeker's avatar Benjamin Beeker

Merge branch 'release'

# Conflicts:
#	pom.xml
parents 72b41201 77bde7cd
Pipeline #10836154 passed with stages
in 1 minute and 41 seconds
......@@ -53,7 +53,7 @@
Markdown is supported
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