Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Fri, 5 Jun 2020 14:53:56 +0000 (16:53 +0200)
committerlain <lain@soykaf.club>
Fri, 5 Jun 2020 14:53:56 +0000 (16:53 +0200)
commita8ca030d85368285af1b960e14dab5b847ecb35a
tree5d8c8922eea940f455946435c073d534df1dec57
parent115d08a7542b92c5e1d889da41c0ee6837a1235e
parent657e1583f8af1ecdf218ba283de4234233bfe5fd
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/transmogrifier.ex
lib/pleroma/web/router.ex