Skip to content
Snippets Groups Projects
Commit 69158e55 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 8b04c4cd 6d4b7900
No related branches found
No related tags found
No related merge requests found
Showing with 256 additions and 65 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment