summary refs log tree commit diff
path: root/synapse/handlers/appservice.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2017-01-05 13:03:02 +0000
committerMatthew Hodgson <matthew@matrix.org>2017-01-05 13:03:02 +0000
commitb31ed227388d1ec599399184b127ad09de9735dc (patch)
treeb4d71b9d56c0a611165f1bf6b682d5cdb1a7d04c /synapse/handlers/appservice.py
parentMerge pull request #1744 from matrix-org/matthew/timeout_get_missing_events (diff)
parentMerge pull request #1766 from matrix-org/markjh/linear_logging (diff)
downloadsynapse-b31ed227388d1ec599399184b127ad09de9735dc.tar.xz
Merge branch 'release-v0.18.6' into develop
Diffstat (limited to 'synapse/handlers/appservice.py')
0 files changed, 0 insertions, 0 deletions