summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-08 13:47:07 +0100
committerNeil Johnson <neil@matrix.org>2018-08-08 13:47:07 +0100
commit2b5baebeba1febc1eac9e7926082c46bf9fa23cd (patch)
tree521a31f1dd9619b30b17af4c4abc3cf19c5db3a0 /synapse/app/homeserver.py
parentMerge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/... (diff)
parentMerge pull request #3633 from matrix-org/neilj/mau_tracker (diff)
downloadsynapse-2b5baebeba1febc1eac9e7926082c46bf9fa23cd.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/disable_hs
Diffstat (limited to 'synapse/app/homeserver.py')
0 files changed, 0 insertions, 0 deletions