Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

6606f7c6

Commit 6606f7c6 authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents a971fa9d 4847a953

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

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

synapse/app/homeserver.py
synapse/config/server.py 1 addition, 1 deletion

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

synapse/python_dependencies.py
synapse/rest/key/__init__.py 14 additions, 0 deletions

synapse/rest/key/__init__.py
synapse/rest/key/v1/__init__.py 14 additions, 0 deletions

synapse/rest/key/v1/__init__.py
synapse/rest/key/v1/server_key_resource.py 0 additions, 0 deletions

synapse/rest/key/v1/server_key_resource.py

with 33 additions and 5 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