Jason Robinson cee4010f94 Merge branch 'develop' into jaywink/admin-forward-extremities ... # Conflicts: # synapse/rest/admin/__init__.py		2021-01-26 10:15:32 +02:00
..
admin	Merge branch 'develop' into jaywink/admin-forward-extremities	2021-01-26 10:15:32 +02:00
client	…
consent	…
key	Add type hints to the crypto module. (#8999)	2021-01-04 10:04:50 -05:00
media	…
oidc	…
saml2	…
synapse	…
__init__.py	…
health.py	…
well_known.py	…