projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
[akkoma]
/
config
/
description.exs
diff --git
a/config/description.exs
b/config/description.exs
index c8e709730ad1a68d7ea9538b98ce31708a0283f9..79e3cc259aefa0d6de3017d9bffeb7a853666b3e 100644
(file)
--- a/
config/description.exs
+++ b/
config/description.exs
@@
-764,12
+764,6
@@
config :pleroma, :config_description, [
"*.quarantined.com"
]
},
- %{
- key: :managed_config,
- type: :boolean,
- description:
- "Whenether the config for pleroma-fe is configured in this config or in static/config.json"
- },
%{
key: :static_dir,
type: :string,