mirror of
https://github.com/hoernschen/dendrite.git
synced 2025-09-10 14:52:46 +00:00
Merge branch 'master' into neilalexander/federationinput
This commit is contained in:
commit
ad19c2b81a
79 changed files with 1351 additions and 1714 deletions
|
@ -111,6 +111,7 @@ func sendMembership(ctx context.Context, accountDB accounts.Database, device *us
|
|||
cfg.Matrix.ServerName,
|
||||
cfg.Matrix.ServerName,
|
||||
nil,
|
||||
false,
|
||||
); err != nil {
|
||||
util.GetLogger(ctx).WithError(err).Error("SendEvents failed")
|
||||
return jsonerror.InternalServerError()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue