summary refs log tree commit diff
path: root/synapse/config/appservice.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-10-18 09:41:53 +0100
committerErik Johnston <erik@matrix.org>2016-10-18 09:41:53 +0100
commit50ac1d843db633d325c5ea39dec3583bf8a6ed0a (patch)
tree825e8f35f31d83e0bee4157192ba4077575b801d /synapse/config/appservice.py
parentMerge pull request #1113 from matrix-org/erikj/remove_auth (diff)
parentUpdate changelog (diff)
downloadsynapse-50ac1d843db633d325c5ea39dec3583bf8a6ed0a.tar.xz
Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/config/appservice.py')
0 files changed, 0 insertions, 0 deletions