summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-22 13:16:35 +0100
committerErik Johnston <erik@matrix.org>2015-10-22 13:16:35 +0100
commit8a98f0dc5b2dceba596f7d25895969a88c223053 (patch)
tree9e62f8773a32fc24f1951a2601fee1f9afabc178 /synapse/handlers/room.py
parentPEP8 (diff)
parentMerge pull request #320 from matrix-org/appservice-retry-cap (diff)
downloadsynapse-8a98f0dc5b2dceba596f7d25895969a88c223053.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
Diffstat (limited to 'synapse/handlers/room.py')
0 files changed, 0 insertions, 0 deletions