Merge remote-tracking branch 'upstream/develop' into nodeinfo2
[friendica.git/.git] / .gitmodules