Merge branch 'master' into neilalexander/nats

This commit is contained in:
Neil Alexander 2021-07-21 13:37:04 +01:00
commit 554d15fc8e
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
71 changed files with 1426 additions and 848 deletions

View file

@ -44,6 +44,8 @@ import (
"github.com/matrix-org/dendrite/eduserver/cache"
"github.com/sirupsen/logrus"
_ "github.com/mattn/go-sqlite3"
)
func createKeyDB(