Merge branch 'develop' into issue/1383

diff --cc config/config.exs
index d706adc6e9c024f9b10a28a75afae58be9c4cad4,2c154eb456e30475a1a5995759648519324b269f..62aef5cf3d2462d879f01d4c427615f6dfb6d0a5
--- 1/config/config.exs
--- 2/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 :swarm, node_blacklist: [~r/myhtml_.*$/]
+ 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"

diff --cc config/description.exs
Simple merge

diff --cc docs/configuration/cheatsheet.md
Simple merge

diff --cc test/support/helpers.ex
Simple merge