Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Mon, 8 Jun 2020 09:19:18 +0000 (11:19 +0200)
committerlain <lain@soykaf.club>
Mon, 8 Jun 2020 09:19:18 +0000 (11:19 +0200)
commit3b5282bef29656f081750a0d9b06a42b912520de
tree137cb16526ef91c507fbdfec4b0d655d180d2d57
parent89b85f65297ef4b8ce92eacb27c90e8f7c874f54
parenta1aa9fa91320d527e93435fe236534003cd85d31
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/pleroma_api/controllers/chat_controller.ex