Skip to content
Snippets Groups Projects
  • Martin Vogel's avatar
    3277df34
    Merge remote-tracking branch 'origin/main' into feature/2016-bundid-messaging · 3277df34
    Martin Vogel authored
    # Conflicts:
    #	client/src/main/java/dev/fitko/fitconnect/api/config/http/HttpConfig.java
    #	client/src/main/java/dev/fitko/fitconnect/client/bootstrap/ClientFactory.java
    #	client/src/main/java/dev/fitko/fitconnect/core/http/DefaultHttpClient.java
    #	client/src/test/java/dev/fitko/fitconnect/core/http/DefaultHttpClientTest.java
    #	config.yml
    #	integration-tests/src/test/java/dev/fitko/fitconnect/integrationtests/RoutingIT.java
    #	pom.xml
    3277df34
    History
    Merge remote-tracking branch 'origin/main' into feature/2016-bundid-messaging
    Martin Vogel authored
    # Conflicts:
    #	client/src/main/java/dev/fitko/fitconnect/api/config/http/HttpConfig.java
    #	client/src/main/java/dev/fitko/fitconnect/client/bootstrap/ClientFactory.java
    #	client/src/main/java/dev/fitko/fitconnect/core/http/DefaultHttpClient.java
    #	client/src/test/java/dev/fitko/fitconnect/core/http/DefaultHttpClientTest.java
    #	config.yml
    #	integration-tests/src/test/java/dev/fitko/fitconnect/integrationtests/RoutingIT.java
    #	pom.xml