summary refs log tree commit diff
path: root/synapse/util
diff options
context:
space:
mode:
authorMichael Kaye <1917473+michaelkaye@users.noreply.github.com>2018-11-02 12:00:18 +0000
committerGitHub <noreply@github.com>2018-11-02 12:00:18 +0000
commit41585e1340ab69b57e72c311413bb086ae8aa66c (patch)
tree682dd596863a03ec42e4eae9d2a0482d67e822dd /synapse/util
parentfix conflict and reinstate 6372dff771413c2b9cd5648cbb6de01a679ef801 (diff)
parentAllow us to configure http vs https for user_directory (diff)
downloadsynapse-41585e1340ab69b57e72c311413bb086ae8aa66c.tar.xz
Merge pull request #4047 from matrix-org/michaelkaye/dinsic_allow_user_directory_url
user_directory.defer_to_id_server should be an URL, not a hostname
Diffstat (limited to 'synapse/util')
0 files changed, 0 insertions, 0 deletions