3 commits

Author	SHA1	Message	Date
Till Faelligen	cb4526793d	Add missing migrations	2022-02-21 12:15:56 +01:00
Till Faelligen	9c3a1cfd47	Merge branch 'main' of github.com:matrix-org/dendrite into s7evink/consent-tracking	2022-02-21 12:08:03 +01:00
Neil Alexander	153bfbbea5	Merge both user API databases into one (#2186) ... * Merge user API databases into one * Remove DeviceDatabase from config * Fix tests * Try that again * Clean up keyserver device keys when the devices no longer exist in the user API * Tweak ordering * Fix UserExists flag, device check * Allow including empty entries so we can clean them up * Remove logging	2022-02-18 11:31:05 +00:00