summary refs log tree commit diff
path: root/demo
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-16 15:10:16 +0100
committerNeil Johnson <neil@matrix.org>2018-08-16 15:10:16 +0100
commitbfb6c586249069ccec46437536607fec3b2e4031 (patch)
tree41dcc4a5be007ec0ed7e3c4c271893eae022eb46 /demo
parentcheck for room state before deciding on action (diff)
parentAdd GET media/v1/config (#3184) (diff)
downloadsynapse-bfb6c586249069ccec46437536607fec3b2e4031.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions