Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

8a98f0dc

Commit 8a98f0dc authored 9 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents f142898f c9c82e8f

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

demo/start.sh 6 additions, 2 deletions

demo/start.sh
synapse/appservice/scheduler.py 2 additions, 2 deletions

synapse/appservice/scheduler.py
synapse/handlers/sync.py 168 additions, 17 deletions

synapse/handlers/sync.py
synapse/rest/client/v1/login.py 2 additions, 0 deletions

synapse/rest/client/v1/login.py
synapse/rest/client/v2_alpha/sync.py 23 additions, 6 deletions

synapse/rest/client/v2_alpha/sync.py
synapse/storage/roommember.py 13 additions, 0 deletions

synapse/storage/roommember.py
tests/events/__init__.py 0 additions, 0 deletions

tests/events/__init__.py
tests/events/test_utils.py 115 additions, 0 deletions

tests/events/test_utils.py

with 329 additions and 27 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