Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

3e6e94fe

Unverified Commit 3e6e94fe authored 6 years ago by Erik Johnston Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge pull request #3872 from matrix-org/hawkowl/timeouts-2

timeouts 2: electric boogaloo

parents 8b365283 bc9af88a

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/3872.misc 1 addition, 0 deletions

changelog.d/3872.misc
synapse/http/__init__.py 2 additions, 2 deletions

synapse/http/__init__.py
synapse/http/client.py 3 additions, 3 deletions

synapse/http/client.py
synapse/http/matrixfederationclient.py 3 additions, 1 deletion

synapse/http/matrixfederationclient.py
synapse/http/site.py 4 additions, 1 deletion

synapse/http/site.py

with 13 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment