Merge remote-tracking branch 'origin/develop' into reactions
authorlain <lain@soykaf.club>
Tue, 27 Aug 2019 21:38:51 +0000 (16:38 -0500)
committerlain <lain@soykaf.club>
Tue, 27 Aug 2019 21:38:51 +0000 (16:38 -0500)
commitf017260cdc90d37c1878d7f2f29263dca017ebeb
tree83b7f405ddaf03e5670635b71ab3d0fca58215da
parenta0b21c89284304bea90f2774f17d5b2b7b3c1359
parent66519f2100c9933b74dc6df52937a18c42961639
Merge remote-tracking branch 'origin/develop' into reactions
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/utils.ex
test/web/activity_pub/activity_pub_test.exs