diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-17 14:04:15 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-17 14:04:15 +0100 |
commit | b5f638f1f478d2e7912d7afc454e881f4677d78c (patch) | |
tree | 2194c747d8c267e2d1f5c490faf80867dba61fc7 /res/templates | |
parent | flake8 (diff) | |
parent | Merge pull request #3708 from matrix-org/neilj/resource_Limit_block_event_cre... (diff) | |
download | synapse-b5f638f1f478d2e7912d7afc454e881f4677d78c.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
Diffstat (limited to 'res/templates')
0 files changed, 0 insertions, 0 deletions