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	Support icons for Identity Providers (#9154)	2021-01-20 08:15:14 -05:00
consent	Remove unnecessary maybeDeferred calls (#8044)	2020-08-07 09:44:48 -04:00
key	Add type hints to the crypto module. (#8999)	2021-01-04 10:04:50 -05:00
media	Return a 404 if no valid thumbnail is found. (#9163)	2021-01-21 14:53:58 -05:00
oidc	Merge different Resource implementation classes (#7732)	2020-07-03 19:02:19 +01:00
saml2	Improve SAML error messages (#8248)	2020-09-14 09:05:36 -04:00
synapse	Fix bugs in handling clientRedirectUrl, and improve OIDC tests (#9127, #9128)	2021-01-18 14:52:49 +00:00
__init__.py	Show a confirmation page during user password reset (#8004)	2020-09-10 11:45:12 +01:00
health.py	Add health check endpoint (#8048)	2020-08-07 14:21:24 +01:00
well_known.py	Give public_baseurl a default value (#9159)	2021-01-20 12:30:41 +00:00