Merge branch 'feature/funkwhale-audio' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sun, 29 Mar 2020 19:18:22 +0000 (19:18 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sun, 29 Mar 2020 19:18:22 +0000 (19:18 +0000)
commite999c67cee65cfe07de6dc76ad18f213c0252bb3
tree8c90fce63d4392ad146e83f2300de3d33eeb83a1
parent4e81b4b190161ebb0c496c682fa8e1e0c38a3903
parent863ec33ba2a90708d199f18683ffe0c4658c710a
Merge branch 'feature/funkwhale-audio' into 'develop'

Add support for funkwhale Audio activity

Closes #764 and #1624

See merge request pleroma/pleroma!2287
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/mastodon_api/views/status_view.ex
test/support/http_request_mock.ex
test/web/mastodon_api/views/status_view_test.exs
test/web/oauth/oauth_controller_test.exs