Skip to content
  • Marvin Berstecher's avatar
    Merge branch 'main' into 'gitlab/sprint-7' · 8c38f7f4
    Marvin Berstecher authored
    # Conflicts:
    #   .air.toml
    #   .env
    #   .gitignore
    #   .gitmodules
    #   .vscode/launch.json
    #   .vscode/settings.json
    #   README.md
    #   cmd/api/connection.go
    #   cmd/api/main.go
    #   cmd/api/message.go
    #   cmd/api/router.go
    #   config.yaml
    #   deployment/docker/Dockerfile
    #   deployment/helm/config/config.yaml
    #   docker-compose.yaml
    #   docs/docs.go
    #   docs/swagger.json
    #   docs/swagger.yaml
    #   go.mod
    #   go.sum
    #   internal/config/config.go
    #   internal/errors/intErr.go
    #   makefile
    #   mediator/connectionManager/connectionManager.go
    #   mediator/database/adapter.go
    #   mediator/database/cassandra.go
    #   mediator/database/demo.go
    #   mediator/didcommResolver.go
    #   mediator/mediator.go
    #   mediator/peerdid.go
    #   mediator/secretsResolver/cassandra.go
    #   mediator/secretsResolver/demo.go
    #   protocol/coordinateMediation.go
    #   protocol/coordinateMediation_test.go
    #   protocol/messagePickup.go
    #   protocol/problemReports.go
    #   protocol/routing.go
    #   protocol/trustPing_test.go
    8c38f7f4