diff options
author | Erik Johnston <erik@matrix.org> | 2014-10-31 17:48:05 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-10-31 17:48:05 +0000 |
commit | b63691f6e205b4e2d2a990ff04318e4daf731e2c (patch) | |
tree | aa7a80d740c7ba8f7f5ce9fe28dc32c523746d53 /synapse/rest/profile.py | |
parent | Coturn's timestamps are in seconds, not milliseconds (diff) | |
parent | Bump version numbers and change log (diff) | |
download | synapse-b63691f6e205b4e2d2a990ff04318e4daf731e2c.tar.xz |
Merge branch 'release-v0.4.2' of github.com:matrix-org/synapse v0.4.2
Diffstat (limited to 'synapse/rest/profile.py')
-rw-r--r-- | synapse/rest/profile.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/rest/profile.py b/synapse/rest/profile.py index dad5a208c7..72e02d8dd8 100644 --- a/synapse/rest/profile.py +++ b/synapse/rest/profile.py @@ -108,9 +108,9 @@ class ProfileRestServlet(RestServlet): ) defer.returnValue((200, { - "displayname": displayname, - "avatar_url": avatar_url - })) + "displayname": displayname, + "avatar_url": avatar_url + })) def register_servlets(hs, http_server): |