Erik Johnston cd22fb568a Merge branch 'master' into develop		2021-08-24 17:13:29 +01:00
..
admin	Implement MSC3231: Token authenticated registration (#10142)	2021-08-21 22:14:43 +01:00
client	Merge branch 'master' into develop	2021-08-24 17:13:29 +01:00
key	Rewrite the KeyRing (#10035)	2021-06-02 16:37:59 +01:00
media	Flatten the synapse.rest.client package (#10600)	2021-08-17 11:57:58 +00:00
__init__.py	Remove redundant "coding: utf-8" lines (#9786)	2021-04-14 15:34:27 +01:00
test_health.py	Remove redundant "coding: utf-8" lines (#9786)	2021-04-14 15:34:27 +01:00
test_well_known.py	Remove redundant "coding: utf-8" lines (#9786)	2021-04-14 15:34:27 +01:00