diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-05-30 17:42:48 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-05-30 17:42:48 +0000 |
| commit | 4a58cb469bf2732c3d8dce06764fcd9232367c2c (patch) | |
| tree | 890552db0f1934794404a56895c0697e3bedeeef /docs/clients.md | |
| parent | 5d40ffe429caa21eab33951457bb314677753866 (diff) | |
| parent | 0204ceff7f66cffd87f06926ad856742940e02ff (diff) | |
| download | pleroma-4a58cb469bf2732c3d8dce06764fcd9232367c2c.tar.gz pleroma-4a58cb469bf2732c3d8dce06764fcd9232367c2c.zip | |
Merge branch 'ffmpeg' into 'develop'
Add ffmpeg to docker image
See merge request pleroma/pleroma!3428
Diffstat (limited to 'docs/clients.md')
0 files changed, 0 insertions, 0 deletions