Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Tue, 29 Jan 2019 05:11:08 +0000 (05:11 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Tue, 29 Jan 2019 05:11:08 +0000 (05:11 +0000)
commitebb3496386c1e195b48bcdc9d72c4c30e60fe340
tree47e7c0be6bcf4615e9dd3db7ad66a2f65757c69f
parent009273fd6e4d14601ebd9f02f2fd797716f774ed
parent61d6715714fe9c2ce6bf4fe6afc353f7fe5502a6
Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'

Rich Media support, part 2.

See merge request pleroma/pleroma!719
lib/pleroma/web/mastodon_api/views/status_view.ex