summary refs log tree commit diff
path: root/docker
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-09 11:42:02 +0100
committerNeil Johnson <neil@matrix.org>2018-08-09 11:42:02 +0100
commit3dce9050cf4b175bc84b5fa45f4c480ac5ddeec9 (patch)
treec371df3e91aa4e6c9c6d573a690e1ab7748def44 /docker
parentMerge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b... (diff)
parentMerge pull request #3655 from matrix-org/neilj/disable_hs (diff)
downloadsynapse-3dce9050cf4b175bc84b5fa45f4c480ac5ddeec9.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_block
Diffstat (limited to 'docker')
0 files changed, 0 insertions, 0 deletions