From: lain <lain@soykaf.club>
Date: Sun, 28 Feb 2021 16:18:23 +0000 (+0000)
Subject: Merge branch 'bugfix/peertube-mpegURL-object' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=050c4b1f145fabac4347bc670a15b1d125882bd5;p=akkoma

Merge branch 'bugfix/peertube-mpegURL-object' into 'develop'

Video: Handle peertube videos only stashing attachments in x-mpegURL

Closes #2372 and #2535

See merge request pleroma/pleroma!3336
---

050c4b1f145fabac4347bc670a15b1d125882bd5