Merge remote-tracking branch 'upstream/2021.12-rc' into diaspora-contact-details
authorMichael <heluecht@pirati.ca>
Thu, 30 Dec 2021 22:17:33 +0000 (22:17 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 30 Dec 2021 22:17:33 +0000 (22:17 +0000)
commit3d9be965a652139f764f87ac1bd0b814c82f44e4
treea81e04b342e3ebcca96ecc74f9e5d9c65af8bcd9
parent29be22ee6a866381257e8b8d68ee7005da30911b
parentc10e0a8683ca114cbdd78f6d9ac82e8aaa614bb2
Merge remote-tracking branch 'upstream/2021.12-rc' into diaspora-contact-details