Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index b01c097c5d014e256dc1eae3553837e564384430..bd8922b772355b5b0cf21ac651bd6486b1042d17 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -8,8 +8,6 @@ use Mix.Config
 # General application configuration
 config :pleroma, ecto_repos: [Pleroma.Repo]
 
-config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
-
 config :pleroma, Pleroma.Captcha,
   enabled: false,
   seconds_valid: 60,
@@ -274,8 +272,6 @@ config :pleroma, :media_proxy,
 
 config :pleroma, :chat, enabled: true
 
-config :ecto, json_library: Jason
-
 config :phoenix, :format_encoders, json: Jason
 
 config :pleroma, :gopher,