Skip to content
Snippets Groups Projects
Commit 2fc4fa59 authored by Jan Zickermann's avatar Jan Zickermann
Browse files

Merge branch 'main' into develop

# Conflicts:
#	pom.xml
parents 270b9df1 9a9399c9
No related branches found
No related tags found
1 merge request!10Draft: Develop
Pipeline #2473 skipped