summary refs log tree commit diff
path: root/MAP.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-01-11 11:23:40 +0000
committerErik Johnston <erik@matrix.org>2018-01-11 11:23:40 +0000
commit07ab948c38bd6ace4b648d98ef383c006003047b (patch)
tree59833960299618a89ef6c480a6cd7349a339ca25 /MAP.rst
parentMerge pull request #2773 from matrix-org/erikj/hash_bg (diff)
parentMerge branch 'release-v0.26.0' of github.com:matrix-org/synapse (diff)
downloadsynapse-07ab948c38bd6ace4b648d98ef383c006003047b.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'MAP.rst')
0 files changed, 0 insertions, 0 deletions