diff options
| author | Erik Johnston <erik@matrix.org> | 2016-08-05 11:15:48 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-08-05 11:15:48 +0100 |
| commit | 499dc1b349988e23ab26f829b2005f617134e6c0 (patch) | |
| tree | 866dec5ab910b42fd22b5826721c0ec7f8ad7cff /synapse/handlers/device.py | |
| parent | Bump version and changelog (diff) | |
| parent | Merge pull request #986 from matrix-org/erikj/state (diff) | |
| download | synapse-499dc1b349988e23ab26f829b2005f617134e6c0.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0
Diffstat (limited to 'synapse/handlers/device.py')
| -rw-r--r-- | synapse/handlers/device.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py index f4bf159bb5..8d630c6b1a 100644 --- a/synapse/handlers/device.py +++ b/synapse/handlers/device.py @@ -29,7 +29,7 @@ class DeviceHandler(BaseHandler): @defer.inlineCallbacks def check_device_registered(self, user_id, device_id, - initial_device_display_name): + initial_device_display_name=None): """ If the given device has not been registered, register it with the supplied display name. |