Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature...
authorFrancis Dinh <normandy@firemail.cc>
Wed, 25 Apr 2018 04:46:28 +0000 (00:46 -0400)
committerFrancis Dinh <normandy@firemail.cc>
Wed, 25 Apr 2018 04:46:28 +0000 (00:46 -0400)
commit9e0dd21ed637ec7b884570b2ad8705b5fac72580
tree6efae2883556ee499dcefb0083412701b501f3e8
parent0df1a4efc841af4a12f45c1551f372d867ff7e1d
parentd4a54a90c9ae39947c71876d4d2988a05a02d7a1
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/utils.ex
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
test/web/activity_pub/activity_pub_test.exs