Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Terraform modules
- Service Desk

Snippets Groups Projects

e2b861cc

Commit e2b861cc authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents eea2dc7d b796d4b9

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

docs/client-server/howto.rst 2 additions, 1 deletion

docs/client-server/howto.rst
jsfiddles/register_login/demo.css 7 additions, 0 deletions

jsfiddles/register_login/demo.css
jsfiddles/register_login/demo.html 20 additions, 0 deletions

jsfiddles/register_login/demo.html
jsfiddles/register_login/demo.js 69 additions, 0 deletions

jsfiddles/register_login/demo.js
synapse/handlers/presence.py 0 additions, 3 deletions

synapse/handlers/presence.py
webclient/components/matrix/matrix-service.js 1 addition, 3 deletions

webclient/components/matrix/matrix-service.js
webclient/room/room.html 1 addition, 1 deletion

webclient/room/room.html

with 100 additions and 8 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