pleroma

commit: 09df007aef62eda95796b5316d1b54866f264a05
parent 68b4de75585cac4c4e58cf1e9a44887b61efa35e
Author: nicole mikołajczyk <me@mkljczk.pl>
Date:   Sat,  1 Nov 2025 11:25:57 +0100

Merge branch 'plaroma' into 'develop'

i don't think it's called plaroma lol

See merge request pleroma/pleroma!4378
Diffstat:
A
changelog.d/plaroma.skip
2
++
M
docs/installation/optional/media_graphics_packages.md
6
+++---

2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/changelog.d/plaroma.skip b/changelog.d/plaroma.skip
@@ -0,0 +1 @@
+i don't think it's called plaroma
+\ No newline at end of file
diff --git a/docs/installation/optional/media_graphics_packages.md b/docs/installation/optional/media_graphics_packages.md
@@ -16,7 +16,7 @@ Note: the packages are not required with the current default settings of Pleroma
 
 It is required for the following Pleroma features:
 
-* `Pleroma.Upload.Filters.Mogrify`, `Pleroma.Upload.Filters.Mogrifun` upload filters (related config: `Plaroma.Upload/filters` in `config/config.exs`)
+* `Pleroma.Upload.Filters.Mogrify`, `Pleroma.Upload.Filters.Mogrifun` upload filters (related config: `Pleroma.Upload/filters` in `config/config.exs`)
 * Media preview proxy for still images (related config: `media_preview_proxy/enabled` in `config/config.exs`)
   
 ## `ffmpeg`
@@ -33,5 +33,5 @@ It is required for the following Pleroma features:
 
 It is required for the following Pleroma features:
 
-* `Pleroma.Upload.Filters.Exiftool.StripLocation` upload filter (related config: `Plaroma.Upload/filters` in `config/config.exs`)
-* `Pleroma.Upload.Filters.Exiftool.ReadDescription` upload filter (related config: `Plaroma.Upload/filters` in `config/config.exs`)
+* `Pleroma.Upload.Filters.Exiftool.StripLocation` upload filter (related config: `Pleroma.Upload/filters` in `config/config.exs`)
+* `Pleroma.Upload.Filters.Exiftool.ReadDescription` upload filter (related config: `Pleroma.Upload/filters` in `config/config.exs`)