summary refs log tree commit diff
path: root/docker
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-17 14:34:10 +0100
committerNeil Johnson <neil@matrix.org>2018-08-17 14:34:10 +0100
commit3ee57bdcbba4d9c90d6ac0f8a14baf9ca210ae18 (patch)
treeac129344d773907ebd7b989b56436140f09e1e2c /docker
parentMerge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... (diff)
parentMerge pull request #3707 from matrix-org/neilj/limit_exceeded_error (diff)
downloadsynapse-3ee57bdcbba4d9c90d6ac0f8a14baf9ca210ae18.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
Diffstat (limited to 'docker')
0 files changed, 0 insertions, 0 deletions