summary refs log tree commit diff
path: root/synapse/config/appservice.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-04-08 16:43:17 +0100
committerErik Johnston <erik@matrix.org>2015-04-08 16:43:17 +0100
commit9cef051ce2b97aa6a0513744fe4f7adb93d76fe9 (patch)
treec7c2b3ac6447384b91d8f433bd0f3045aab680e6 /synapse/config/appservice.py
parentMerge pull request #118 from matrix-org/dont-wait-for-notify (diff)
parentMerge pull request #119 from matrix-org/hotfixes-v0.8.1-r3 (diff)
downloadsynapse-9cef051ce2b97aa6a0513744fe4f7adb93d76fe9.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/config/appservice.py')
0 files changed, 0 insertions, 0 deletions