Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Thu, 7 May 2020 13:05:40 +0000 (15:05 +0200)
committerlain <lain@soykaf.club>
Thu, 7 May 2020 13:05:40 +0000 (15:05 +0200)
commitfb2d284d2897e8b789da4f81ae8d288373d2bf76
tree35b6a6d3c656244528dc2455f768b4f9704fce8e
parent1748e2694815da20689005110937ea42cd554d70
parentb7635bf2b6c5251ffc8f3b3b8e1bc7ee9db83b7e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/common_api/utils.ex
lib/pleroma/web/router.ex