summary refs log tree commit diff
path: root/docs/sphinx/synapse.api.events.room.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-04-11 10:40:49 +0100
committerErik Johnston <erik@matrix.org>2016-04-11 10:40:49 +0100
commit58de897c77b17e467d9fa31dae4691ccaf70b731 (patch)
tree18380495d0abbbb8216e5107fbc9f40226a54d9e /docs/sphinx/synapse.api.events.room.rst
parentSupport PyPy (diff)
parentMerge pull request #677 from matrix-org/erikj/dns_cache (diff)
downloadsynapse-58de897c77b17e467d9fa31dae4691ccaf70b731.tar.xz
Merge branch 'develop' into HEAD
Diffstat (limited to 'docs/sphinx/synapse.api.events.room.rst')
0 files changed, 0 insertions, 0 deletions