Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Mon, 4 May 2020 08:43:20 +0000 (10:43 +0200)
committerlain <lain@soykaf.club>
Mon, 4 May 2020 08:43:20 +0000 (10:43 +0200)
commitc40afe5ba040964834657ef18f92bf9f1a1770d1
tree842774fee81293fc9f65a23beaa0a312acf7ab92
parent9249742f13445f47167d4b352751c49caf48aa8f
parent095635453ac58b9e01a32ad226c0b61466c16da0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lib/pleroma/notification.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/common_api/utils.ex
lib/pleroma/web/router.ex
test/web/common_api/common_api_test.exs