diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-22 20:20:39 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-22 20:20:39 +0300 |
| commit | cf19bf3c7c82eb64f10cee309484d9591b1a3cae (patch) | |
| tree | 77cd904cd7d397eb2ac72561a8cd5dcdd0609044 /config/config.exs | |
| parent | e761d76e4fe95a8fadd8eb05d5c55ef5fc4bc8ec (diff) | |
| parent | be2777715650d0ac80509f0bd22b4cea8641f9b3 (diff) | |
| download | pleroma-cf19bf3c7c82eb64f10cee309484d9591b1a3cae.tar.gz pleroma-cf19bf3c7c82eb64f10cee309484d9591b1a3cae.zip | |
Merge branch 'develop' into issue/1383
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index d706adc6e..62aef5cf3 100644 --- a/config/config.exs +++ b/config/config.exs @@ -98,7 +98,6 @@ config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"], pack_extensions: [".png", ".gif"], groups: [ - # Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md` Custom: ["/emoji/*.png", "/emoji/**/*.png"] ], default_manifest: "https://git.pleroma.social/pleroma/emoji-index/raw/master/index.json", @@ -251,7 +250,6 @@ config :pleroma, :instance, remote_post_retention_days: 90, skip_thread_containment: true, limit_to_local_content: :unauthenticated, - dynamic_configuration: false, user_bio_length: 5000, user_name_length: 100, max_account_fields: 10, @@ -610,6 +608,8 @@ config :pleroma, :web_cache_ttl, config :pleroma, :modules, runtime_dir: "instance/modules" +config :pleroma, configurable_from_database: false + # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" |