Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

ffe59538

Commit ffe59538 authored 5 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 7134ca7d 4e1c7b79

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

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

changelog.d/6318.misc
synapse/app/homeserver.py 92 additions, 82 deletions

synapse/app/homeserver.py
synapse/python_dependencies.py 0 additions, 1 deletion

synapse/python_dependencies.py
synapse/server.py 2 additions, 0 deletions

synapse/server.py
tests/test_phone_home.py 51 additions, 0 deletions

tests/test_phone_home.py

with 146 additions and 83 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