Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

239622f8

Commit 239622f8 authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 9521e675 47a4bff1

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

cmdclient/console.py 37 additions, 25 deletions

cmdclient/console.py
webclient/components/matrix/matrix-service.js 13 additions, 5 deletions

webclient/components/matrix/matrix-service.js
webclient/login/login-controller.js 2 additions, 0 deletions

webclient/login/login-controller.js
webclient/rooms/rooms-controller.js 43 additions, 19 deletions

webclient/rooms/rooms-controller.js

with 95 additions and 49 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