Merge remote-tracking branch 'upstream/2021.03-rc' into issue-10126
[friendica.git/.git] / .gitmodules