Olivier Wilkinson (reivilibre) 00d915b2a7 Merge branch 'master' into develop		2022-06-07 16:59:41 +01:00
..
.gitignore	Correct attrs package name in requirements (#3492)	2018-07-07 10:46:59 +10:00
12738.misc	Return the same error message from /login when password is incorrect and when account doesn't exist. (#12738)	2022-06-07 14:58:48 +00:00
12963.misc	Reduce amount of state we pull out when attempting to send catchup PDUs. (#12963)	2022-06-07 14:35:56 +01:00
12969.misc	Fix a stale comment in get_room_version_id_txn. (#12969)	2022-06-07 07:44:31 -04:00
12970.misc	Consolidate the logic of delete_device/delete_devices. (#12970)	2022-06-07 07:43:35 -04:00
12973.bugfix	Fix Synapse git info missing in version strings (#12973)	2022-06-07 15:24:11 +01:00