summary refs log tree commit diff
path: root/MAP.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-21 11:47:45 +0000
committerErik Johnston <erik@matrix.org>2014-12-21 11:47:45 +0000
commit74ee4048c2b0cb2fa7fb1e80027de37979b5dd86 (patch)
treeacd6ec851f1b951f87f6c5360bbe6d2b358be64a /MAP.rst
parentMerge branch 'hotfixes-v0.6.0' of github.com:matrix-org/synapse into erikj-perf (diff)
parentMerge branch 'hotfixes-v0.6.0' (diff)
downloadsynapse-74ee4048c2b0cb2fa7fb1e80027de37979b5dd86.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into erikj-perf
Diffstat (limited to 'MAP.rst')
0 files changed, 0 insertions, 0 deletions