Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

29532204

Commit 29532204 authored 10 years ago by Mark Haines

Downloads
- Plain Diff

Merge branch 'develop' into client_v2_filter

parents 9150a0d6 acb68a39

Branches

Tags

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

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

synapse/api/errors.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 48 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