Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

46dcb0d8

Commit 46dcb0d8 authored 10 years ago by Mark Haines

Downloads
- Plain Diff

Merge branch 'develop' into server2server_tls

parents ef6a8e4f b9172b98

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

docs/specification.rst 94 additions, 15 deletions

docs/specification.rst
synapse/handlers/message.py 8 additions, 0 deletions

synapse/handlers/message.py
synapse/handlers/presence.py 6 additions, 0 deletions

synapse/handlers/presence.py
tests/rest/test_rooms.py 6 additions, 6 deletions

tests/rest/test_rooms.py
tests/utils.py 3 additions, 2 deletions

tests/utils.py
webclient/index.html 1 addition, 1 deletion

webclient/index.html
webclient/recents/recents-controller.js 5 additions, 0 deletions

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

webclient/recents/recents.html

with 126 additions and 25 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