Merge branch 'master' into basics

Browse Source

# Conflicts:
#	cmd/zitadel/main.go
#	go.mod
#	go.sum
#	internal/config/config.go
#	internal/errors/already_exists_test.go
#	internal/errors/caos_error_test.go
#	internal/errors/deadline_exceeded_test.go
#	internal/errors/error_test.go
#	internal/errors/generate/error_creator.go
#	internal/errors/generate/error_test.go.tmpl
#	internal/errors/internal_test.go
#	internal/errors/invalid_argument_test.go
#	internal/errors/not_found_test.go
#	internal/errors/permission_denied_test.go
#	internal/errors/precondition_failed_test.go
#	internal/errors/unauthenticated_test.go
#	internal/errors/unavailable_test.go
#	internal/errors/unimplemented_test.go
#	internal/errors/unknown_test.go
#	pkg/admin/admin.go
#	pkg/auth/auth.go
#	pkg/management/management.go

...

This commit is contained in:

Livio Amstutz 2020-03-25 10:55:21 +01:00

parent 9da20cfe25 b2d708cb40

commit b2bc0b5efd

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available