summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2025-01-21 18:15:11 +0000
committerlain <lain@soykaf.club>2025-01-21 18:15:11 +0000
commitacced73e5db1597fd1cd2fbf834d4399869209ec (patch)
tree737387923c43a2eab960b1706297275e22f77357
parentf2c612d4aeb1ef2f40503ecf163536667fe0c864 (diff)
parent4128ea39481a8864bcc4631dbb8d1e3d922473ab (diff)
downloadpleroma-acced73e5db1597fd1cd2fbf834d4399869209ec.tar.gz
pleroma-acced73e5db1597fd1cd2fbf834d4399869209ec.zip
Merge branch 'description' into 'develop'
description.exs: Remove suggestion referencing a deleted module See merge request pleroma/pleroma!4316
-rw-r--r--changelog.d/description-update-suggestions.skip0
-rw-r--r--config/description.exs3
2 files changed, 1 insertions, 2 deletions
diff --git a/changelog.d/description-update-suggestions.skip b/changelog.d/description-update-suggestions.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/description-update-suggestions.skip
diff --git a/config/description.exs b/config/description.exs
index 47f4771eb..e8d154124 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -3302,8 +3302,7 @@ config :pleroma, :config_description, [
suggestions: [
Pleroma.Web.Preload.Providers.Instance,
Pleroma.Web.Preload.Providers.User,
- Pleroma.Web.Preload.Providers.Timelines,
- Pleroma.Web.Preload.Providers.StatusNet
+ Pleroma.Web.Preload.Providers.Timelines
]
}
]