Skip to content
Snippets Groups Projects
Commit a3770923 authored by Martin Vogel's avatar Martin Vogel
Browse files

Merge branch 'feature/414-sdk-methoden-signaturen' 

# Conflicts:
#	README.md
#	client/src/main/java/de/fitko/fitconnect/TestRunner.java
#	client/src/main/java/de/fitko/fitconnect/client/SenderClient.java
#	client/src/main/java/de/fitko/fitconnect/client/factory/ClientFactory.java
#	dependency/src/main/java/de/fitko/fitconnect/dependency/ApplicationConfig.java
#	sdk.conf
parents d332facc 743853c4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 40 additions and 26 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment