From: Maksim Pechnikov <parallel588@gmail.com>
Date: Wed, 22 Jan 2020 17:20:39 +0000 (+0300)
Subject: Merge branch 'develop' into issue/1383
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=cf19bf3c7c82eb64f10cee309484d9591b1a3cae;p=akkoma

Merge branch 'develop' into issue/1383
---

cf19bf3c7c82eb64f10cee309484d9591b1a3cae
diff --cc config/config.exs
index d706adc6e,2c154eb45..62aef5cf3
--- a/config/config.exs
+++ b/config/config.exs
@@@ -610,6 -618,9 +608,8 @@@ config :pleroma, :web_cache_ttl
  
  config :pleroma, :modules, runtime_dir: "instance/modules"
  
+ config :pleroma, configurable_from_database: false
+ 
 -config :swarm, node_blacklist: [~r/myhtml_.*$/]
  # 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"