Merge branch 'develop' into fix/mrf-delete
authorrinpatch <rinpatch@sdf.org>
Thu, 5 Dec 2019 21:12:21 +0000 (00:12 +0300)
committerrinpatch <rinpatch@sdf.org>
Thu, 5 Dec 2019 21:12:21 +0000 (00:12 +0300)
commitcdff5b82670313e46c2b362d4cf041779af6a6bd
treeedc39a1b48f48334480e709fbda844cb120b32f8
parent9f99640cfc81f28c0b6cdb5f6ef065b3e46f5f23
parent67d8df04a440ec9b2949bdddd3a3d8dd70c9b140
Merge branch 'develop' into fix/mrf-delete
CHANGELOG.md
lib/pleroma/web/activity_pub/activity_pub.ex
test/web/activity_pub/activity_pub_test.exs