Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

8885c854

Commit 8885c854 authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 3df5cb80 9a93e83d

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

cmdclient/console.py 1 addition, 1 deletion

cmdclient/console.py
synapse/handlers/federation.py 1 addition, 1 deletion

synapse/handlers/federation.py
synapse/handlers/room.py 5 additions, 1 deletion

synapse/handlers/room.py
synapse/rest/__init__.py 3 additions, 2 deletions

synapse/rest/__init__.py
synapse/rest/initial_sync.py 3 additions, 3 deletions

synapse/rest/initial_sync.py
synapse/rest/room.py 2 additions, 2 deletions

synapse/rest/room.py
tests/rest/test_rooms.py 4 additions, 4 deletions

tests/rest/test_rooms.py
webclient/components/matrix/matrix-service.js 3 additions, 3 deletions

webclient/components/matrix/matrix-service.js

with 22 additions and 17 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