Merge branch 'master' into neilalexander/federationinput

This commit is contained in:
Neil Alexander 2022-01-06 13:14:48 +00:00
commit ad19c2b81a
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
79 changed files with 1351 additions and 1714 deletions

View file

@ -368,5 +368,6 @@ func emit3PIDInviteEvent(
cfg.Matrix.ServerName,
cfg.Matrix.ServerName,
nil,
false,
)
}