diff options
| author | Sean King <seanking2919@protonmail.com> | 2021-08-06 08:08:20 -0600 |
|---|---|---|
| committer | Sean King <seanking2919@protonmail.com> | 2021-08-06 08:08:20 -0600 |
| commit | 1841bd8383d7734cb74cff91f61dc7e1fdfad13d (patch) | |
| tree | 6da027d9a35687dc592657d026f8413d235b8966 /config | |
| parent | 9758f636b26477b4695cd2c1ea6f0f5aceca9835 (diff) | |
| parent | 5f5dc24027ee5cfadd226c5db2e2a2bdb0ababe0 (diff) | |
| download | pleroma-1841bd8383d7734cb74cff91f61dc7e1fdfad13d.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index c00d5dca9..51a6bdbd5 100644 --- a/config/config.exs +++ b/config/config.exs @@ -457,7 +457,7 @@ config :pleroma, :shout, enabled: true, limit: 5_000 -config :phoenix, :format_encoders, json: Jason +config :phoenix, :format_encoders, json: Jason, "activity+json": Jason config :phoenix, :json_library, Jason |