summary refs log tree commit diff
path: root/MAP.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-05 18:00:51 +0000
committerErik Johnston <erik@matrix.org>2015-11-05 18:00:51 +0000
commitf23af34729e0e226f0fe1dc505d13ce589a8afae (patch)
tree379600a3af98606ae834275c44289516f9c47689 /MAP.rst
parentAdd PR (diff)
parentMerge pull request #350 from matrix-org/erikj/search (diff)
downloadsynapse-f23af34729e0e226f0fe1dc505d13ce589a8afae.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0
Diffstat (limited to 'MAP.rst')
0 files changed, 0 insertions, 0 deletions