summary refs log tree commit diff
path: root/synapse/secrets.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-08-22 17:18:28 +0100
committerGitHub <noreply@github.com>2018-08-22 17:18:28 +0100
commita5806aba2751d5a658e657ed489be26869d93f4e (patch)
tree9a9344671dc650b85a5bd42b0fb9d6649ae0834f /synapse/secrets.py
parentMerge branch 'master' into develop (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... (diff)
downloadsynapse-a5806aba2751d5a658e657ed489be26869d93f4e.tar.xz
Merge pull request #3680 from matrix-org/neilj/server_notices_on_blocking
server notices on resource limit blocking
Diffstat (limited to 'synapse/secrets.py')
0 files changed, 0 insertions, 0 deletions