Merge branch 'bugfix/peertube-mpegURL-object' into 'develop'
authorlain <lain@soykaf.club>
Sun, 28 Feb 2021 16:18:23 +0000 (16:18 +0000)
committerlain <lain@soykaf.club>
Sun, 28 Feb 2021 16:18:23 +0000 (16:18 +0000)
commit050c4b1f145fabac4347bc670a15b1d125882bd5
tree6b47fa6d592d9a4509787982b0c3669b6b816132
parente6a14e1cd10a52450eaf3d1ba258eac4042d82a9
parent7fc9cd09740e31fe75ff3402f29614bb328240f7
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