Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

5758dafb

Commit 5758dafb authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'develop' of github.com:matrix-org/synapse into state-chache

parents eae0842b 6370cffb

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

VERSION 0 additions, 1 deletion

VERSION
setup.py 26 additions, 35 deletions

setup.py
synapse/__init__.py 1 addition, 1 deletion

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

synapse/app/homeserver.py
synapse/crypto/keyclient.py 2 additions, 2 deletions

synapse/crypto/keyclient.py
synapse/handlers/presence.py 4 additions, 4 deletions

synapse/handlers/presence.py
synapse/handlers/sync.py 1 addition, 1 deletion

synapse/handlers/sync.py
synapse/http/server.py 1 addition, 2 deletions

synapse/http/server.py
synapse/python_dependencies.py 3 additions, 3 deletions

synapse/python_dependencies.py
synapse/rest/client/v1/directory.py 1 addition, 1 deletion

synapse/rest/client/v1/directory.py
synapse/rest/client/v2_alpha/sync.py 1 addition, 1 deletion

synapse/rest/client/v2_alpha/sync.py
synapse/rest/media/v1/upload_resource.py 2 additions, 2 deletions

synapse/rest/media/v1/upload_resource.py

with 43 additions and 54 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