Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

eae0842b

Commit eae0842b authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'develop' of github.com:matrix-org/synapse into state-chache

parents 093e34e3 c8e1da93

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

synapse/federation/transaction_queue.py 7 additions, 2 deletions

synapse/federation/transaction_queue.py
synapse/handlers/presence.py 3 additions, 1 deletion

synapse/handlers/presence.py
synapse/handlers/register.py 8 additions, 5 deletions

synapse/handlers/register.py
synapse/push/__init__.py 5 additions, 3 deletions

synapse/push/__init__.py
synapse/push/baserules.py 6 additions, 5 deletions

synapse/push/baserules.py
synapse/push/rulekinds.py 6 additions, 6 deletions

synapse/push/rulekinds.py
synapse/python_dependencies.py 4 additions, 2 deletions

synapse/python_dependencies.py
synapse/rest/client/v1/push_rule.py 13 additions, 5 deletions

synapse/rest/client/v1/push_rule.py
synapse/rest/client/v1/pusher.py 2 additions, 2 deletions

synapse/rest/client/v1/pusher.py
synapse/rest/media/v1/upload_resource.py 4 additions, 3 deletions

synapse/rest/media/v1/upload_resource.py
synapse/storage/_base.py 3 additions, 3 deletions

synapse/storage/_base.py
synapse/storage/push_rule.py 3 additions, 1 deletion

synapse/storage/push_rule.py

with 64 additions and 38 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