projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d40ffe 0204cef)
Merge branch 'ffmpeg' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sun, 30 May 2021 17:42:48 +0000 (17:42 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sun, 30 May 2021 17:42:48 +0000 (17:42 +0000)
Add ffmpeg to docker image

See merge request pleroma/pleroma!3428


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