summary refs log tree commit diff
path: root/synapse/rest/profile.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-30 11:13:58 +0000
committerMark Haines <mark.haines@matrix.org>2014-10-30 11:13:58 +0000
commit7c063995123297dfd569f68e0f195cad7fa327c5 (patch)
tree2ce0eb2215707808c689ac9ea9787fff8a9c7664 /synapse/rest/profile.py
parentPep8 and a few doc strings (diff)
parentFix pep8 warnings (diff)
downloadsynapse-7c063995123297dfd569f68e0f195cad7fa327c5.tar.xz
Merge branch 'develop' into request_logging
Conflicts:
	synapse/config/logger.py
Diffstat (limited to 'synapse/rest/profile.py')
-rw-r--r--synapse/rest/profile.py6
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):