Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

b1e98ddc

Commit b1e98ddc authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents ff3709e5 bcf8eb68

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

tests/handlers/test_federation.py 0 additions, 1 deletion

tests/handlers/test_federation.py
tests/handlers/test_room.py 3 additions, 3 deletions

tests/handlers/test_room.py
tests/rest/test_rooms.py 16 additions, 16 deletions

tests/rest/test_rooms.py
tests/rest/utils.py 11 additions, 11 deletions

tests/rest/utils.py
tests/utils.py 5 additions, 3 deletions

tests/utils.py
webclient/home/home-controller.js 6 additions, 4 deletions

webclient/home/home-controller.js
webclient/home/home.html 1 addition, 1 deletion

webclient/home/home.html

with 42 additions and 39 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