Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Tue, 9 Jun 2020 07:36:07 +0000 (09:36 +0200)
committerlain <lain@soykaf.club>
Tue, 9 Jun 2020 07:36:07 +0000 (09:36 +0200)
commit064c4f86f32b626a626fbc238f09434617f57a90
tree0f36da23c31c76554659aab55da4dc5c64f4b307
parent40d5058cc4d8b235fa1ea7842c511f08df346c61
parent674efb0ad2b34cbd4bbb32d414a2c8fa8719cc02
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/router.ex