summary refs log tree commit diff
path: root/MAP.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-26 16:03:56 +0100
committerErik Johnston <erik@matrix.org>2014-08-26 16:03:56 +0100
commit3df5cb804f0b9a3ca6a5db969a4ac8e8d42685cd (patch)
treee8ababe0e0b7beb91e31d6687f1fb6ad10b73193 /MAP.rst
parentMerge branch 'develop' of github.com:matrix-org/synapse into stream_refactor (diff)
parentFix pyflakes errors (diff)
downloadsynapse-3df5cb804f0b9a3ca6a5db969a4ac8e8d42685cd.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Diffstat (limited to 'MAP.rst')
0 files changed, 0 insertions, 0 deletions