summary refs log tree commit diff
path: root/demo
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-17 14:04:15 +0100
committerNeil Johnson <neil@matrix.org>2018-08-17 14:04:15 +0100
commitb5f638f1f478d2e7912d7afc454e881f4677d78c (patch)
tree2194c747d8c267e2d1f5c490faf80867dba61fc7 /demo
parentflake8 (diff)
parentMerge pull request #3708 from matrix-org/neilj/resource_Limit_block_event_cre... (diff)
downloadsynapse-b5f638f1f478d2e7912d7afc454e881f4677d78c.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