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
..
main	Merge branch 'develop' into jaywink/admin-forward-extremities	2021-01-26 10:15:32 +02:00
state	Use execute_batch in more places (#9188)	2021-01-21 14:44:12 +00:00
__init__.py	Add logging on startup/shutdown (#8448)	2020-10-02 15:20:45 +01:00