mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 15:37:33 +00:00
Merge branch 'master' into new-eventstore
# Conflicts: # go.mod # internal/admin/repository/eventsourcing/eventstore/iam.go # internal/authz/repository/eventsourcing/repository.go # internal/eventstore/eventstore.go # internal/setup/config.go # pkg/grpc/management/mock/management.proto.mock.go
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -44,4 +44,5 @@ tmp/
|
||||
console/src/app/proto/generated/
|
||||
|
||||
pkg/grpc/*/*.pb.*
|
||||
pkg/grpc/*/mock/*.mock.go
|
||||
pkg/grpc/*/*.swagger.json
|
Reference in New Issue
Block a user