[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon...

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 5206fe3759c26e43e7a5537746ac5665002e97e7..0e91df88660a83e3a40ab91bc6dc12ff321b8a24 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -373,6 +373,8 @@ config :pleroma, :chat, enabled: true
 
 config :phoenix, :format_encoders, json: Jason
 
+config :phoenix, :json_library, Jason
+
 config :pleroma, :gopher,
   enabled: false,
   ip: {0, 0, 0, 0},