Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

66a4d335

Commit 66a4d335 authored 10 years ago by Mark Haines

Downloads
- Plain Diff

Merge branch 'develop' into storage_transactions

parents 47c1a3d4 d0103400

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 1 addition, 1 deletion

cmdclient/console.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 16 additions and 15 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