Merge branch 'develop' into issue/1276

This commit is contained in:
Maksim Pechnikov 2020-04-02 14:47:17 +03:00
commit dbcfac11b4
153 changed files with 4880 additions and 1693 deletions

View file

@ -841,6 +841,8 @@ Some modifications are necessary to save the config settings correctly:
Most of the settings will be applied in `runtime`, this means that you don't need to restart the instance. But some settings are applied in `compile time` and require a reboot of the instance, such as:
- all settings inside these keys:
- `:hackney_pools`
- `:connections_pool`
- `:pools`
- `:chat`
- partially settings inside these keys:
- `:seconds_valid` in `Pleroma.Captcha`