diff options
| author | Erik Johnston <erik@matrix.org> | 2016-08-04 15:29:45 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-08-04 15:29:45 +0100 |
| commit | b3682df2ca0673d703e05fdbfc43b79a61517948 (patch) | |
| tree | 79275cc75a3b5b56ce44f3750821f66ab5f89db0 /synapse/handlers/device.py | |
| parent | Don't infer paragrahs from newlines (diff) | |
| parent | Merge pull request #979 from matrix-org/erikj/state_ids_api (diff) | |
| download | synapse-b3682df2ca0673d703e05fdbfc43b79a61517948.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/xpath_fix
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. |