Skip to content
Snippets Groups Projects
Commit 118a9eaf authored by Brendan Abolivier's avatar Brendan Abolivier
Browse files

Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/new_push_rules

parents dd11f575 079bc3c8
No related branches found
No related tags found
Loading
Showing
with 32 additions and 3 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 to comment