Merge branch 'develop' into issue/1411
authorMark Felder <feld@FreeBSD.org>
Wed, 11 Dec 2019 21:02:53 +0000 (15:02 -0600)
committerMark Felder <feld@FreeBSD.org>
Wed, 11 Dec 2019 21:02:53 +0000 (15:02 -0600)
commit9ef912aecfbeef670db0614ec2014321c37f3b7a
tree69eb0b5e11ca321e1ba8ca794171bf0cb425d16d
parente21afdb7c76c9773aeb51e37ff3bc2874e7a74f7
parent92b4a1aa1bc750bb077ae45c422967f9712e247d
Merge branch 'develop' into issue/1411
lib/pleroma/object.ex
lib/pleroma/web/activity_pub/activity_pub.ex
test/web/activity_pub/activity_pub_test.exs