Skip to content
Snippets Groups Projects
Commit 4026d555 authored by Andrew Morgan's avatar Andrew Morgan
Browse files

Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upgrade

parents 1ce46396 57a3e96e
No related branches found
No related tags found
Loading
Showing
with 331 additions and 94 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