Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / test / fixtures / httpoison_mock / skruyb@mamot.fr.atom
2017-05-11 Roger BraunFix cws.