Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

a955cbfa

Commit a955cbfa authored 9 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setup

parents 2152b320 8c97b498

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

synapse/handlers/federation.py 7 additions, 1 deletion

synapse/handlers/federation.py
synapse/push/baserules.py 6 additions, 0 deletions

synapse/push/baserules.py
synapse/rest/client/v1/push_rule.py 12 additions, 7 deletions

synapse/rest/client/v1/push_rule.py
synapse/storage/push_rule.py 2 additions, 1 deletion

synapse/storage/push_rule.py

with 27 additions and 9 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