summary refs log tree commit diff
path: root/synapse/util/versionstring.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2017-01-05 12:02:23 +0000
committerGitHub <noreply@github.com>2017-01-05 12:02:23 +0000
commite1c5463efc43f1bba45216cc47e88c28f09fe1be (patch)
tree24230206fed49711294cb8a190525ac4c0818003 /synapse/util/versionstring.py
parentMerge pull request #1764 from matrix-org/markjh/fix_send_pdu (diff)
parentfix comment (diff)
downloadsynapse-e1c5463efc43f1bba45216cc47e88c28f09fe1be.tar.xz
Merge pull request #1765 from matrix-org/markjh/timeout_get_missing_events
cherrypick #1744: limit total timeout for get_missing_events to 10s
Diffstat (limited to 'synapse/util/versionstring.py')
0 files changed, 0 insertions, 0 deletions