Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

287c81ab

Commit 287c81ab authored 9 years ago by Daniel Wagner-Hall

Downloads
- Plain Diff

Merge branch 'develop' into daniel/useragent

parents b28c7da0 49ebd472

Branches

Tags

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

synapse/api/auth.py 24 additions, 1 deletion

synapse/api/auth.py
synapse/api/constants.py 1 addition, 0 deletions

synapse/api/constants.py
synapse/app/synctl.py 2 additions, 2 deletions

synapse/app/synctl.py
synapse/events/utils.py 4 additions, 1 deletion

synapse/events/utils.py
synapse/handlers/_base.py 26 additions, 4 deletions

synapse/handlers/_base.py
synapse/handlers/federation.py 133 additions, 77 deletions

synapse/handlers/federation.py
synapse/handlers/message.py 4 additions, 0 deletions

synapse/handlers/message.py
synapse/handlers/room.py 21 additions, 2 deletions

synapse/handlers/room.py
synapse/rest/client/v2_alpha/receipts.py 4 additions, 0 deletions

synapse/rest/client/v2_alpha/receipts.py
tests/test_state.py 1 addition, 1 deletion

tests/test_state.py

with 220 additions and 88 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