summary refs log tree commit diff
path: root/synapse/handlers/directory.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-19 16:37:08 +0000
committerErik Johnston <erik@matrix.org>2014-12-19 16:37:08 +0000
commitd61109f5781fecfdc8b3ea1f1ae74a72f8a2a913 (patch)
treedff914dc74740d36be1da73be66a8b06c6c4feea /synapse/handlers/directory.py
parentMerge branch 'release-v0.6.0' of github.com:matrix-org/synapse into erikj-perf (diff)
parentSet a state_key for the topic and room name, otherwise they won't be treated ... (diff)
downloadsynapse-d61109f5781fecfdc8b3ea1f1ae74a72f8a2a913.tar.xz
Merge branch 'hotfixes-v0.6.0' of github.com:matrix-org/synapse into erikj-perf
Diffstat (limited to 'synapse/handlers/directory.py')
-rw-r--r--synapse/handlers/directory.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py
index 66d3b533d9..a907a66e12 100644
--- a/synapse/handlers/directory.py
+++ b/synapse/handlers/directory.py
@@ -155,4 +155,4 @@ class DirectoryHandler(BaseHandler):
             "room_id": room_id,
             "sender": user_id,
             "content": {"aliases": aliases},
-        })
+        }, ratelimit=False)