Merge branch 'develop' of https://github.com/friendica/friendica into develop
[friendica.git/.git] / .gitmodules