summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/config.exs1
-rw-r--r--config/test.exs1
2 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index a5df31b5a..8f6fe00fb 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -32,6 +32,7 @@ config :mime, :types, %{
config :pleroma, :websub, Pleroma.Web.Websub
config :pleroma, :ostatus, Pleroma.Web.OStatus
+config :pleroma, :httpoison, HTTPoison
# Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above.
diff --git a/config/test.exs b/config/test.exs
index 85b6ad26b..04136e1f2 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -27,3 +27,4 @@ config :comeonin, :pbkdf2_rounds, 1
config :pleroma, :websub, Pleroma.Web.WebsubMock
config :pleroma, :ostatus, Pleroma.Web.OStatusMock
+config :pleroma, :httpoison, HTTPoisonMock