Skip to content
Snippets Groups Projects
Commit 742ea9c7 authored by Henry Borasch's avatar Henry Borasch
Browse files

Merge branch 'main' into 978_remove_spring-web

# Conflicts:
#	api/src/main/java/dev/fitko/fitconnect/api/config/ApplicationConfig.java
#	api/src/main/java/dev/fitko/fitconnect/api/config/ResourcePaths.java
#	client/src/main/java/dev/fitko/fitconnect/client/bootstrap/ClientFactory.java
#	core/src/main/java/dev/fitko/fitconnect/core/events/EventLogApiService.java
#	core/src/main/java/dev/fitko/fitconnect/core/http/RestService.java
#	core/src/main/java/dev/fitko/fitconnect/core/http/UserAgentInterceptor.java
#	core/src/main/java/dev/fitko/fitconnect/core/schema/SchemaResourceProvider.java
#	core/src/main/java/dev/fitko/fitconnect/core/submission/SubmissionApiService.java
#	core/src/test/java/dev/fitko/fitconnect/core/http/ProxyRestTemplateTest.java
#	core/src/test/java/dev/fitko/fitconnect/core/http/RestServiceTest.java
#	core/src/test/java/dev/fitko/fitconnect/core/http/RestTemplateTest.java
#	integration-tests/src/test/java/dev/fitko/fitconnect/integrationtests/AuthenticationIT.java
#	integration-tests/src/test/java/dev/fitko/fitconnect/integrationtests/SubscriberClientIT.java
#	pom.xml
parents 9060c4e3 87b8f41e
No related branches found
No related tags found
Loading
Showing
with 59 additions and 35 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment