Commit b14a8dd1 authored by Adam Gausmann's avatar Adam Gausmann

Merge branch 'master' into 'masterfix'

# Conflicts:
#   api/pom.xml
#   pom.xml
#   runtime/pom.xml
parents 01b01fa8 24791ddb
Pipeline #5443257 passed with stages
in 18 seconds
......@@ -26,4 +26,4 @@
</dependency>
</dependencies>
</project>
</project>
\ No newline at end of file
......@@ -109,4 +109,4 @@
</snapshotRepository>
</distributionManagement>
</project>
</project>
\ No newline at end of file
......@@ -48,4 +48,4 @@
</plugins>
</build>
</project>
</project>
\ No newline at end of file
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