Merge branch 'develop' of akkoma.dev:AkkomaGang/akkoma into develop

This commit is contained in:
FloatingGhost 2023-03-10 03:51:45 +00:00
commit 08dfce98be

View file

@ -65,6 +65,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
"shareable_emoji_packs", "shareable_emoji_packs",
"multifetch", "multifetch",
"pleroma:api/v1/notifications:include_types_filter", "pleroma:api/v1/notifications:include_types_filter",
"quote_posting",
"editing", "editing",
if Config.get([:media_proxy, :enabled]) do if Config.get([:media_proxy, :enabled]) do
"media_proxy" "media_proxy"