summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-05-09 13:05:09 +0100
committerErik Johnston <erik@matrix.org>2016-05-09 13:05:09 +0100
commitdef64d6ef32ea1b2acc92e470db307e97c6eac05 (patch)
tree8d29d7d432a5b703d15f1176ae7e720b1caa5805 /synapse/api
parentAdd bulk fetch storage API (diff)
parentMerge pull request #764 from matrix-org/erikj/replication_logging (diff)
downloadsynapse-def64d6ef32ea1b2acc92e470db307e97c6eac05.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions