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

..

api

Merge branch 'master' into proto-files

2020-03-30 17:43:59 +02:00

admin.go

improve some functions

2020-03-30 07:23:43 +02:00