Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

73884eba

Commit 73884eba authored 6 years ago by Amber Brown

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into hawkowl/timeouts-2

parents 1c3f4d9c 7c27c4d5

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

.circleci/config.yml 12 additions, 5 deletions

.circleci/config.yml
.travis.yml 3 additions, 0 deletions

.travis.yml
changelog.d/3576.feature 1 addition, 0 deletions

changelog.d/3576.feature
synapse/http/client.py 10 additions, 4 deletions

synapse/http/client.py
synapse/push/httppusher.py 6 additions, 1 deletion

synapse/push/httppusher.py
synapse/push/mailer.py 4 additions, 3 deletions

synapse/push/mailer.py
synapse/replication/slave/storage/devices.py 16 additions, 7 deletions

synapse/replication/slave/storage/devices.py
tox.ini 3 additions, 41 deletions

tox.ini

with 55 additions and 61 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