From: Maksim Pechnikov <parallel588@gmail.com>
Date: Sat, 21 Dec 2019 17:37:29 +0000 (+0300)
Subject: Merge branch 'develop' into issue/1383
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=54c9db38c8035ecc115e136a09a3d991e426959a;p=akkoma

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

54c9db38c8035ecc115e136a09a3d991e426959a
diff --cc config/config.exs
index a737c98af,5839cbe4a..bbd8f7d78
--- a/config/config.exs
+++ b/config/config.exs
@@@ -609,6 -621,9 +611,8 @@@ config :pleroma, :web_cache_ttl
    activity_pub: nil,
    activity_pub_question: 30_000
  
+ config :pleroma, :modules, runtime_dir: "instance/modules"
+ 
 -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"