summary refs log tree commit diff
path: root/MAP.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-10-11 14:08:29 +0100
committerErik Johnston <erik@matrix.org>2016-10-11 14:08:29 +0100
commit3061dac53eef21110d8d9f08554f28c562175a18 (patch)
tree51a8cb5ed3f294887bdcc2d6ef36efcad186af07 /MAP.rst
parentFix check of wrong variable (diff)
parentMerge pull request #1166 from matrix-org/rav/grandfather_broken_riot_signup (diff)
downloadsynapse-3061dac53eef21110d8d9f08554f28c562175a18.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/replication_noop
Diffstat (limited to 'MAP.rst')
0 files changed, 0 insertions, 0 deletions