summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-10-02 18:11:24 +0100
committerErik Johnston <erik@matrix.org>2017-10-02 18:11:24 +0100
commite585c83209349d2d6e679cccc9f916edd2df1728 (patch)
tree4b54914df6bfee4cfcf0a0dcbe4b2393d8f0ea4f /synapse/api
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentBump version and changelog (diff)
downloadsynapse-e585c83209349d2d6e679cccc9f916edd2df1728.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions