Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

6f0bba19

Commit 6f0bba19 authored 10 years ago by Kegan Dougal

Downloads
- Plain Diff

Merge branch 'client_server_url_rename' into develop

parents 9a93e83d 5a93bfe1

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

cmdclient/console.py 3 additions, 4 deletions

cmdclient/console.py
synapse/rest/room.py 48 additions, 49 deletions

synapse/rest/room.py
tests/rest/test_events.py 1 addition, 1 deletion

tests/rest/test_events.py
tests/rest/test_rooms.py 12 additions, 23 deletions

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

tests/rest/utils.py
webclient/components/matrix/matrix-service.js 5 additions, 6 deletions

webclient/components/matrix/matrix-service.js

with 73 additions and 87 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