summary refs log tree commit diff
path: root/MAP.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-11-19 18:03:03 +0000
committerErik Johnston <erik@matrix.org>2014-11-19 18:03:03 +0000
commit1a9551db82d553316d65ad9521d47bbe438db6c4 (patch)
tree6015e4155502d34fd8aa35fc32094d8c29981a0a /MAP.rst
parentBump version, changelog and upgrade.rst (diff)
parentFix tests from prev commit (diff)
downloadsynapse-1a9551db82d553316d65ad9521d47bbe438db6c4.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.5.0
Diffstat (limited to 'MAP.rst')
0 files changed, 0 insertions, 0 deletions