zitadel/internal
Fabiennne 85aa907d12 Merge branch 'master' into proto-files
# Conflicts:
#	go.mod
#	go.sum
#	pkg/admin/admin.go
#	pkg/admin/api/config.go
#	pkg/auth/api/config.go
#	pkg/auth/auth.go
#	pkg/management/api/config.go
#	pkg/management/management.go
2020-03-30 17:43:59 +02:00
..
admin add basic config and change i18n pkg 2020-03-25 07:58:58 +01:00
api fix tracing/statusFromError 2020-03-30 13:17:49 +02:00
auth add basic config and change i18n pkg 2020-03-25 07:58:58 +01:00
config add multi files config test and some more 2020-03-30 11:44:17 +02:00
crypto add multi files config test and some more 2020-03-30 11:44:17 +02:00
errors fix path in error_creator.go message 2020-03-24 07:22:31 +01:00
login add basic config and change i18n pkg 2020-03-25 07:58:58 +01:00
management add basic config and change i18n pkg 2020-03-25 07:58:58 +01:00
proto single marshaller 2020-03-30 16:53:29 +02:00
protoc fix: start server and gateway 2020-03-25 10:54:45 +01:00
tracing fix tracing/statusFromError 2020-03-30 13:17:49 +02:00