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

This commit is contained in:
Erik Johnston 2018-10-26 16:22:45 +01:00
commit 03e634dad4
115 changed files with 3799 additions and 1683 deletions

File diff suppressed because it is too large Load diff