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

Merge branch 'develop' into gun

Browse source
This commit is contained in:
Alexander Strizhakov 2020-03-20 20:47:54 +03:00
commit 9bae9b1b1b
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
108 changed files with 1075 additions and 390 deletions
Download patch file Download diff file Expand all files Collapse all files

5
config/config.exs
View file

@ -645,6 +645,11 @@ config :pleroma, :hackney_pools,
timeout: 300_000
]
config :pleroma, :restrict_unauthenticated,
timelines: %{local: false, federated: false},
profiles: %{local: false, remote: false},
activities: %{local: false, remote: false}
# Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above.
import_config "#{Mix.env()}.exs"