summary refs log tree commit diff
path: root/MAP.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-07-13 13:50:57 +0100
committerErik Johnston <erik@matrix.org>2015-07-13 13:50:57 +0100
commit5989637f37b127f2a0c55ef0b1085ebd0d2928c1 (patch)
tree0480f8a77111f35aede6622e7ff0ed8329b6a6dd /MAP.rst
parentComments (diff)
parentMerge pull request #196 from matrix-org/erikj/room_history (diff)
downloadsynapse-5989637f37b127f2a0c55ef0b1085ebd0d2928c1.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts
Diffstat (limited to 'MAP.rst')
0 files changed, 0 insertions, 0 deletions