summary refs log tree commit diff
path: root/MAP.rst
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-08-28 15:35:39 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-08-28 15:35:39 +0100
commit4d1ea4000856cd29778da2616fb8f602892905e0 (patch)
tree68e4786675aa53586f31b27608f5acfe69a687af /MAP.rst
parentAllow users to redact their own events (diff)
parentMerge branch 'release-v0.10.0' into develop (diff)
downloadsynapse-4d1ea4000856cd29778da2616fb8f602892905e0.tar.xz
Merge branch 'develop' into redactyoself
Conflicts:
	synapse/handlers/_base.py
Diffstat (limited to 'MAP.rst')
0 files changed, 0 insertions, 0 deletions