diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2020-07-01 11:12:28 +0100 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-07-01 11:12:28 +0100 |
commit | 8fed03aa3efd1b9c80b3115caea577fa4d5a58bd (patch) | |
tree | 0d95b6892c524adcfad5374891c867e68e640935 /synapse/server.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff) | |
parent | Back out MSC2625 implementation (#7761) (diff) | |
download | synapse-8fed03aa3efd1b9c80b3115caea577fa4d5a58bd.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions