]> git.mxchange.org Git - friendica.git/commitdiff
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)

Trivial merge