Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Sun, 13 May 2018 09:59:35 +0000 (11:59 +0200)
committerlain <lain@soykaf.club>
Sun, 13 May 2018 09:59:35 +0000 (11:59 +0200)
commita5c9dd0a2aa792ed075c6ff83b1de262a1529026
treecde89f940be50a6ad13d3acc0a0c15d237ca7d96
parent3c3933e40bce7001b5025bf2e05412dd9c128f0f
parentaeff2d647483d5348cc1da5c901ce55f1c02b733
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lib/pleroma/web/activity_pub/activity_pub.ex