summary refs log tree commit diff
path: root/synapse/config/voip.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-04-17 16:08:28 +0100
committerErik Johnston <erik@matrix.org>2015-04-17 16:08:28 +0100
commit4a5990ff8fba3c00851bb601a2482152fc4bb57f (patch)
treeca5b548faf1a3044c82f344d5601ea05fe718a07 /synapse/config/voip.py
parentAdd kick users script (diff)
parentMerge pull request #124 from matrix-org/hotfixes-v0.8.1-r4 (diff)
downloadsynapse-4a5990ff8fba3c00851bb601a2482152fc4bb57f.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/config/voip.py')
0 files changed, 0 insertions, 0 deletions