Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

7c89d5e9

Commit 7c89d5e9 authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 226025e9 f53c4300

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

docs/client-server/swagger_matrix/rooms 196 additions, 8 deletions

docs/client-server/swagger_matrix/rooms
synapse/rest/room.py 46 additions, 0 deletions

synapse/rest/room.py
webclient/app.css 23 additions, 0 deletions

webclient/app.css
webclient/recents/recents-controller.js 5 additions, 1 deletion

webclient/recents/recents-controller.js
webclient/recents/recents.html 4 additions, 1 deletion

webclient/recents/recents.html
webclient/room/room-controller.js 4 additions, 1 deletion

webclient/room/room-controller.js
webclient/room/room.html 5 additions, 1 deletion

webclient/room/room.html
webclient/settings/settings-controller.js 1 addition, 1 deletion

webclient/settings/settings-controller.js

with 284 additions and 13 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