Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

0e367563

Commit 0e367563 authored 9 years ago by Mark Haines

Downloads
- Plain Diff

Merge branch 'develop' into markjh/room_tags

parents fb469374 0f432ba5

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

synapse/events/utils.py 2 additions, 1 deletion

synapse/events/utils.py
synapse/handlers/__init__.py 2 additions, 1 deletion

synapse/handlers/__init__.py
synapse/handlers/room.py 55 additions, 0 deletions

synapse/handlers/room.py
synapse/handlers/search.py 55 additions, 1 deletion

synapse/handlers/search.py
synapse/handlers/sync.py 40 additions, 21 deletions

synapse/handlers/sync.py
synapse/rest/client/v1/room.py 36 additions, 0 deletions

synapse/rest/client/v1/room.py
synapse/rest/client/v2_alpha/sync.py 4 additions, 2 deletions

synapse/rest/client/v2_alpha/sync.py
synapse/storage/stream.py 136 additions, 1 deletion

synapse/storage/stream.py
synapse/types.py 1 addition, 1 deletion

synapse/types.py
tests/test_types.py 7 additions, 2 deletions

tests/test_types.py
tox.ini 1 addition, 0 deletions

tox.ini

with 339 additions and 30 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