Eric Eastwood b559e2326b Merge branch 'develop' into madlittlemods/return-historical-events-in-order-from-backfill ... Conflicts: synapse/rest/client/room_batch.py		2021-11-11 00:56:50 -06:00
..
admin	Allow admins to proactively block rooms (#11228)	2021-11-09 13:11:47 +00:00
client	Merge branch 'develop' into madlittlemods/return-historical-events-in-order-from-backfill	2021-11-11 00:56:50 -06:00
consent	Use direct references for configuration variables (part 4). (#10893)	2021-09-23 12:03:01 -04:00
key	Add reactor to SynapseRequest and fix up types. (#10868)	2021-09-24 11:01:25 +01:00
media	Merge remote-tracking branch 'origin/master' into develop	2021-11-02 14:28:27 +00:00
synapse	Use direct references for configuration variables (part 5). (#10897)	2021-09-24 07:25:21 -04:00
__init__.py	Add missing type hints to non-client REST servlets. (#10817)	2021-09-15 08:45:32 -04:00
health.py	Add missing type hints to non-client REST servlets. (#10817)	2021-09-15 08:45:32 -04:00
well_known.py	Default value for public_baseurl (#11210)	2021-11-08 14:13:10 +00:00