summary refs log tree commit diff
path: root/synapse/config/_base.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-09-16 12:42:42 +0100
committerErik Johnston <erik@matrix.org>2020-09-16 12:42:42 +0100
commit9c8ef134fec6295903d3e268e9a34dff530d92e8 (patch)
tree2e0984df14664e81f4553cfcb42db0b1592ee6cd /synapse/config/_base.py
parentClarify changelog. (diff)
parentNewsfile (diff)
downloadsynapse-9c8ef134fec6295903d3e268e9a34dff530d92e8.tar.xz
Merge branch 'erikj/fix_origin_check' into release-v1.20.0
Diffstat (limited to 'synapse/config/_base.py')
0 files changed, 0 insertions, 0 deletions