Skip to content
Snippets Groups Projects
Commit d6d7e0cd authored by Tobias Bruns's avatar Tobias Bruns
Browse files

Merge remote-tracking branch 'origin/release'

# Conflicts:
#	common/pom.xml
#	enterprise-adapter/pom.xml
#	fim-adapter/pom.xml
#	formcycle-adapter/formcycle-adapter-impl/pom.xml
#	formcycle-adapter/formcycle-adapter-interface/pom.xml
#	formcycle-adapter/pom.xml
#	forwarder/pom.xml
#	pom.xml
#	router/pom.xml
#	semantik-adapter/pom.xml
parents 539624c6 a3a76c89
No related branches found
No related tags found
No related merge requests found
...@@ -102,4 +102,4 @@ ...@@ -102,4 +102,4 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment