Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

ddfcdd47

Commit ddfcdd47 authored 8 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents fa9d2c72 6f0c5e5d

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

docs/workers.rst 1 addition, 0 deletions

docs/workers.rst
synapse/app/client_reader.py 1 addition, 1 deletion

synapse/app/client_reader.py
synapse/handlers/room_list.py 141 additions, 115 deletions

synapse/handlers/room_list.py
synapse/push/baserules.py 49 additions, 0 deletions

synapse/push/baserules.py
synapse/rest/client/v1/room.py 2 additions, 2 deletions

synapse/rest/client/v1/room.py

with 194 additions and 118 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