Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Thu, 23 Apr 2020 13:47:08 +0000 (15:47 +0200)
committerlain <lain@soykaf.club>
Thu, 23 Apr 2020 13:47:08 +0000 (15:47 +0200)
commitec7335535d857c6777798ed08dab357b07fb6efa
tree09b32798fbaa271c6ea33912899cc067e0cdd495
parent1d6338f2d38284e94e17be58c21c7f34b5621ab7
parent1b5f8d19eeccfe202c0377079caa6a1d6f3cacb5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/side_effects.ex
lib/pleroma/web/common_api/common_api.ex
test/web/common_api/common_api_test.exs