Skip to content
Snippets Groups Projects
  • Klaus Fischer's avatar
    4b33e489
    Merge branch 'main' into epic/1256-bidiko · 4b33e489
    Klaus Fischer authored
    # Conflicts:
    #	Examples/ConsoleAppExample/ConsoleAppExample.csproj
    #	FitConnect/ClientFactory.cs
    #	FitConnect/FitConnect.csproj
    #	Tests/BasicUnitTest/BasicUnitTest.csproj
    #	Tests/BasicUnitTest/SubscriberTests.cs
    #	Tests/E2ETest/E2ETest.csproj
    #	Tests/EncryptionTests/EncryptionTests.csproj
    #	Tests/IntegrationTests/IntegrationTests.csproj
    #	Tests/IntegrationTests/Routing/RoutingTests.cs
    #	Tests/MockContainer/MockContainer.csproj
    4b33e489
    History
    Merge branch 'main' into epic/1256-bidiko
    Klaus Fischer authored
    # Conflicts:
    #	Examples/ConsoleAppExample/ConsoleAppExample.csproj
    #	FitConnect/ClientFactory.cs
    #	FitConnect/FitConnect.csproj
    #	Tests/BasicUnitTest/BasicUnitTest.csproj
    #	Tests/BasicUnitTest/SubscriberTests.cs
    #	Tests/E2ETest/E2ETest.csproj
    #	Tests/EncryptionTests/EncryptionTests.csproj
    #	Tests/IntegrationTests/IntegrationTests.csproj
    #	Tests/IntegrationTests/Routing/RoutingTests.cs
    #	Tests/MockContainer/MockContainer.csproj