Livio Amstutz 5b84c9b619 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		2021-01-05 09:27:42 +01:00
..
providers	new pkg structure (#1150)	2021-01-04 14:52:13 +01:00
repository	fix: lock again (#1132)	2020-12-22 12:27:55 +01:00
static	fix: email styling (#918)	2020-10-28 15:26:20 +01:00
statik	feat: Notification translation (#192)	2020-06-09 15:11:42 +02:00
templates	fix: pubsub (#1122)	2020-12-21 18:42:34 +01:00
types	feat: Private label email policy (#813)	2020-10-20 19:10:23 +02:00
notification.go	feat: Notification translation (#192)	2020-06-09 15:11:42 +02:00