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

Merge branch 'KOP-2964-Refactoring-von-WebClient-zu-RestClient' into...

Merge branch 'KOP-2964-Refactoring-von-WebClient-zu-RestClient' into OZG-4094-Senden-von-Nachrichten-Fix

# Conflicts:
#	pom.xml
#	src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/OsiPostfachRemoteService.java
#	src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/config/ApiClientConfiguration.java
#	src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/config/Osi2PostfachProperties.java
#	src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/PostfachApiFacadeService.java
#	src/main/resources/application.yml
#	src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/OsiPostfachRemoteServiceITCase.java
#	src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/factory/JsonUtil.java
parents 4316a99b 9452d418
No related branches found
No related tags found
2 merge requests!9Draft: Ozg 4094 wiremock ausprobieren,!7Ozg-4094 Konfiguration für nachrichten-manager
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment