Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

34101427

Commit 34101427 authored 8 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0

parents c95dd7a4 e7674eb7

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

scripts-dev/federation_client.py 1 addition, 0 deletions

scripts-dev/federation_client.py
synapse/app/federation_reader.py 1 addition, 1 deletion

synapse/app/federation_reader.py
synapse/app/homeserver.py 1 addition, 1 deletion

synapse/app/homeserver.py
synapse/app/pusher.py 1 addition, 1 deletion

synapse/app/pusher.py
synapse/app/synchrotron.py 1 addition, 1 deletion

synapse/app/synchrotron.py
synapse/federation/federation_client.py 24 additions, 11 deletions

synapse/federation/federation_client.py
synapse/federation/transport/server.py 72 additions, 41 deletions

synapse/federation/transport/server.py
synapse/metrics/__init__.py 11 additions, 2 deletions

synapse/metrics/__init__.py
synapse/metrics/metric.py 2 additions, 3 deletions

synapse/metrics/metric.py
synapse/python_dependencies.py 3 additions, 1 deletion

synapse/python_dependencies.py
synapse/rest/media/v1/preview_url_resource.py 2 additions, 1 deletion

synapse/rest/media/v1/preview_url_resource.py
synapse/storage/events.py 1 addition, 1 deletion

synapse/storage/events.py
synapse/util/versionstring.py 4 additions, 4 deletions

synapse/util/versionstring.py

with 124 additions and 68 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