Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

704c3e62

Commit 704c3e62 authored 6 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge branch 'master' into develop

parents 40c1c59c 43ecfe0b

No related branches found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

.github/ISSUE_TEMPLATE.md 3 additions, 2 deletions

.github/ISSUE_TEMPLATE.md
CHANGES.md 9 additions, 0 deletions

CHANGES.md
synapse/__init__.py 1 addition, 1 deletion

synapse/__init__.py
synapse/config/server.py 2 additions, 0 deletions

synapse/config/server.py
synapse/federation/federation_server.py 1 addition, 0 deletions

synapse/federation/federation_server.py
synapse/handlers/events.py 21 additions, 4 deletions

synapse/handlers/events.py
synapse/handlers/federation.py 23 additions, 6 deletions

synapse/handlers/federation.py
synapse/rest/client/v1/events.py 1 addition, 1 deletion

synapse/rest/client/v1/events.py
synapse/rest/client/v1/room.py 1 addition, 1 deletion

synapse/rest/client/v1/room.py
synapse/storage/event_federation.py 1 addition, 0 deletions

synapse/storage/event_federation.py
synapse/storage/events_worker.py 14 additions, 6 deletions

synapse/storage/events_worker.py

with 77 additions and 21 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