summary refs log tree commit diff
path: root/MAP.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-13 18:16:12 +0000
committerErik Johnston <erik@matrix.org>2014-12-13 18:16:12 +0000
commit3983c7fb0ffa5c95c3b143aecd32510c156f9950 (patch)
tree08ad33e77f0c0f56a8acb4c2ed00966c553c1909 /MAP.rst
parentFix typo in media repository doc string (diff)
parentBump version and change log (diff)
downloadsynapse-3983c7fb0ffa5c95c3b143aecd32510c156f9950.tar.xz
Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'MAP.rst')
0 files changed, 0 insertions, 0 deletions