Merge develop
This commit is contained in:
commit
8f5589cf66
44 changed files with 1844 additions and 1066 deletions
|
|
@ -2445,7 +2445,7 @@ config :pleroma, :config_description, [
|
|||
%{
|
||||
group: :pleroma,
|
||||
key: Pleroma.Formatter,
|
||||
label: "Auto Linker",
|
||||
label: "Linkify",
|
||||
type: :group,
|
||||
description:
|
||||
"Configuration for Pleroma's link formatter which parses mentions, hashtags, and URLs.",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue