diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-08-03 14:30:32 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-08-03 14:30:32 +0100 |
| commit | 530bc862dc9bd9d3c9f567738e8b56df1146bc3b (patch) | |
| tree | bd915629f8bc5a3a6568e1e1035d8dedf6dccae4 /synapse/handlers | |
| parent | Merge branch 'rav/refactor_device_query' into develop (diff) | |
| parent | PEP8 (diff) | |
| download | synapse-530bc862dc9bd9d3c9f567738e8b56df1146bc3b.tar.xz | |
Merge branch 'rav/null_default_device_displayname' into develop
Diffstat (limited to 'synapse/handlers')
| -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. |