squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move defaults from sample_config.exs to config.exs

Browse Source
This commit is contained in:
Egor Kislitsyn 2019-01-09 17:02:30 +07:00
parent 48591aab98
commit 28afcb7c31
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.exs
View File

@ -138,7 +138,8 @@ config :pleroma, :instance,
], ],
finmoji_enabled: true, finmoji_enabled: true,
mrf_transparency: true, mrf_transparency: true,
autofollowed_nicknames: [] autofollowed_nicknames: [],
max_pinned_statuses: 1
config :pleroma, :markup, config :pleroma, :markup,
# XXX - unfortunately, inline images must be enabled by default right now, because # XXX - unfortunately, inline images must be enabled by default right now, because

3
lib/mix/tasks/pleroma/sample_config.eex
View File

@ -14,8 +14,7 @@ config :pleroma, :instance,
email: "<%= email %>", email: "<%= email %>",
limit: 5000, limit: 5000,
registrations_open: true, registrations_open: true,
dedupe_media: false, dedupe_media: false
max_pinned_statuses: 1
config :pleroma, :media_proxy, config :pleroma, :media_proxy,
enabled: false, enabled: false,