Merge branch 'main' of github.com:matrix-org/dendrite into s7evink/keyserveruserapi

This commit is contained in:
Till Faelligen 2023-02-17 11:41:31 +01:00
commit 4cb5c2a952
No known key found for this signature in database
GPG key ID: ACCDC9606D472758

View file

@ -650,7 +650,7 @@ func (d *Database) CreateDevice(
}
}
}
return
return dev, returnErr
}
// generateDeviceID creates a new device id. Returns an error if failed to generate