diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-01 20:08:14 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-01 20:08:14 +0300 |
| commit | 98b96e45ababecb7554232787968f2f326f24e54 (patch) | |
| tree | 66e907ccc1acd2c667b57f5b5d0a8db34cbd288c /docs/API/admin_api.md | |
| parent | 2f2bd7fe72f474b7177c751a2dc3af716622ba91 (diff) | |
| parent | ef7d2b0f11a9bf74e982b73ae4cec632f93fbebc (diff) | |
| download | pleroma-98b96e45ababecb7554232787968f2f326f24e54.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'docs/API/admin_api.md')
| -rw-r--r-- | docs/API/admin_api.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/API/admin_api.md b/docs/API/admin_api.md index edcf73e14..58d702347 100644 --- a/docs/API/admin_api.md +++ b/docs/API/admin_api.md @@ -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` |