From: lain <lain@soykaf.club>
Date: Fri, 17 May 2019 10:26:59 +0000 (+0200)
Subject: Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=412a3d8a0f74ee3a46f9ba98d906c65c6c1c4da8;p=akkoma

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
---

412a3d8a0f74ee3a46f9ba98d906c65c6c1c4da8
diff --cc config/config.exs
index 42e4cb4ce,61e2648a9..e82f08e07
--- a/config/config.exs
+++ b/config/config.exs
@@@ -476,8 -465,9 +465,11 @@@ config :pleroma, :oauth2
    token_expires_in: 600,
    issue_new_refresh_token: true
  
 +config :pleroma, :database, rum_enabled: false
 +
+ config :http_signatures,
+   adapter: Pleroma.Signature
+ 
  # 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"