Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses
authorlain <lain@soykaf.club>
Sun, 13 May 2018 08:56:11 +0000 (10:56 +0200)
committerlain <lain@soykaf.club>
Sun, 13 May 2018 08:56:11 +0000 (10:56 +0200)
commit76722ea9c8dfbb8fefe247883946aa5c872d9a49
tree34020541df1d6684e935cfd09f36cb6eed7b13f6
parenta3d1d4894fdd8dd0133e1d2c6fde9d95f49dfcc7
parentbb864e96ad4e0be470da78baa000019f571e30db
Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses
lib/pleroma/web/activity_pub/activity_pub.ex