Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

8e571cbe

Commit 8e571cbe authored 10 years ago by Mark Haines

Downloads
- Plain Diff

Merge branch 'client_v2_filter' into client_v2_sync

parents cf7c54ec 29532204

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

synapse/api/errors.py 1 addition, 0 deletions

synapse/api/errors.py
synapse/api/filtering.py 6 additions, 13 deletions

synapse/api/filtering.py
synapse/push/__init__.py 13 additions, 9 deletions

synapse/push/__init__.py
synapse/push/httppusher.py 4 additions, 4 deletions

synapse/push/httppusher.py
synapse/push/pusherpool.py 1 addition, 1 deletion

synapse/push/pusherpool.py
synapse/rest/__init__.py 1 addition, 1 deletion

synapse/rest/__init__.py
synapse/rest/client/v1/push_rule.py 22 additions, 7 deletions

synapse/rest/client/v1/push_rule.py
synapse/storage/push_rule.py 5 additions, 4 deletions

synapse/storage/push_rule.py
synapse/storage/pusher.py 1 addition, 1 deletion

synapse/storage/pusher.py

with 54 additions and 40 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