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

Merge branch 'refs/heads/master' into OZG-5868-RemoveHackathon-Feature

# Conflicts:
#	alfa-server/src/main/resources/application-e2e.yml
#	alfa-service/src/main/java/de/ozgcloud/alfa/common/FeatureToggleProperties.java
#	alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangProcessor.java
#	alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangProcessorTest.java
parents 83b500a6 bdf60274
No related branches found
No related tags found
No related merge requests found
Showing
with 815 additions and 134 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment