Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Wed, 6 May 2020 09:44:30 +0000 (11:44 +0200)
committerlain <lain@soykaf.club>
Wed, 6 May 2020 09:44:30 +0000 (11:44 +0200)
commit205313e54146c00374e3edfa951132a7229fa16d
treedb392c5ef71a2a40fb8a041635d2536b34dc454d
parent9637cded21cef1e6c531dd46d5f5245c4c3ed03c
parent07e7c80bc9e919cd92ca9dda1e21384142e5bd77
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