summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-05-14 14:42:47 +0100
committerErik Johnston <erik@matrix.org>2019-05-14 14:42:47 +0100
commit495e859e580a458055d5b12417583b39dba8e067 (patch)
tree55b716f28f98153e618ece1868dfeb53d9772780 /synapse/api
parentMerge branch 'erikj/async_serialize_event' into erikj/reactions_rebase (diff)
parentNewsfile (diff)
downloadsynapse-495e859e580a458055d5b12417583b39dba8e067.tar.xz
Merge branch 'erikj/fix_config_ratelimiting' into erikj/test
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions