Skip to content
Snippets Groups Projects
Commit 46800a60 authored by OZGCloud's avatar OZGCloud
Browse files

Merge branch 'refs/heads/release' into merge-hotfix

# Conflicts:
#	common/pom.xml
#	enterprise-adapter/pom.xml
#	formcycle-adapter/formcycle-adapter-impl/pom.xml
#	formcycle-adapter/formcycle-adapter-interface/pom.xml
#	formcycle-adapter/pom.xml
#	formsolutions-adapter/pom.xml
#	forwarder/pom.xml
#	intelliform-adapter/pom.xml
#	pom.xml
#	router/pom.xml
#	semantik-adapter/pom.xml
#	xta-adapter/pom.xml
parents 73b4b0b8 dbd424ee
No related branches found
No related tags found
No related merge requests found
......@@ -29,7 +29,7 @@
<parent>
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>eingang-manager</artifactId>
<version>2.10.0-SNAPSHOT</version>
<version>2.9.0</version>
<relativePath>../</relativePath>
</parent>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment