Skip to content
Snippets Groups Projects
Commit de3cddc4 authored by Klaus Fischer's avatar Klaus Fischer
Browse files

Merge branch 'feature/564-routing-api' of...

Merge branch 'feature/564-routing-api' of https://git.fitko.de/fit-connect/sdk-dotnet into feature/564-routing-api

# Conflicts:
#	BasicUnitTest/SecurityEventTokenTests.cs
#	E2ETest/EndToEndTestBase.cs
#	FitConnect/Models/FitConnectEnvironment.cs
#	FitConnect/Models/SecurityEventToken.cs
#	FitConnect/Properties/AssemblyInfo.cs
#	FitConnect/Subscriber.cs
#	IntegrationTests/Subscriber/SubscriberTestUnHappyPath.cs
parents 2480a1c7 04f57e1f
Loading
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