hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe

Browse source
This commit is contained in:
Sean King 2021-08-06 08:08:20 -06:00
commit 1841bd8383
24 changed files with 323 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/config.exs
View file

@ -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