projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6a14e1 7fc9cd0)
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)
Video: Handle peertube videos only stashing attachments in x-mpegURL

Closes #2372 and #2535

See merge request pleroma/pleroma!3336


Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git