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)
1  2 
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/router.ex

Simple merge