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

Merge branch 'master' into OZG-6810-FileManager-Dateiinhalt-ersetzen-proto

# Conflicts:
#	vorgang-manager-server/pom.xml
#	vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java
parents a450fd60 17e282bb
No related branches found
No related tags found
1 merge request!4Revert "OZG-6810 [tmp] update version"
Showing with 247 additions and 167 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment