summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-11 16:12:59 +0000
committerErik Johnston <erik@matrix.org>2015-02-11 16:12:59 +0000
commit41a9a76a99b5668217ed0bd97dda2b8689d13c1b (patch)
treed0326a7a299eef31fa89d8b91fa871732a148890 /synapse/api
parentMerge branch 'develop' of github.com:matrix-org/synapse into timeout-federati... (diff)
parentMerge pull request #65 from matrix-org/get_event_cache (diff)
downloadsynapse-41a9a76a99b5668217ed0bd97dda2b8689d13c1b.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federation-requests
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions