summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-12-22 13:58:18 +0000
committerMark Haines <mark.haines@matrix.org>2015-12-22 13:58:18 +0000
commitc058625959dd45f09f1838b4d7e98e4d73c193cf (patch)
treebe6fa0a73eebdb4b65b0e183d78130dc40923226 /scripts
parentHook up read receipts and typing notifications for guest access (diff)
parentMerge pull request #454 from matrix-org/markjh/room_filtering (diff)
downloadsynapse-c058625959dd45f09f1838b4d7e98e4d73c193cf.tar.xz
Merge remote-tracking branch 'origin/develop' into markjh/guest_access
Conflicts:
	synapse/api/filtering.py
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions