summary refs log tree commit diff
path: root/synapse/config/voip.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-02-18 14:52:23 +0000
committerBrendan Abolivier <babolivier@matrix.org>2019-02-18 14:52:23 +0000
commit68a53f825fc3ecb415571bda2bfc7c1df5edefb7 (patch)
tree8f71f2a3123fe30230d798259eca391794c52d48 /synapse/config/voip.py
parentTypo in changelog (diff)
parentMerge pull request #4643 from matrix-org/erikj/catch_exceptions (diff)
downloadsynapse-68a53f825fc3ecb415571bda2bfc7c1df5edefb7.tar.xz
Merge branch 'develop' into babolivier/acme-delegated
Diffstat (limited to 'synapse/config/voip.py')
0 files changed, 0 insertions, 0 deletions