diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-11-19 19:35:44 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-11-19 19:35:44 +0300 |
| commit | b27d8f74370ad404a91b15fa1f51ea6162f35098 (patch) | |
| tree | 470f5bd604cad39dcf5163d18be3be2a78bf20f6 /docs/configuration | |
| parent | e164c37139c4365d7d46a2a990b364ad26dfdbf7 (diff) | |
| parent | c8d11c306452ea36f5690ba1824434dc71bd9f95 (diff) | |
| download | pleroma-b27d8f74370ad404a91b15fa1f51ea6162f35098.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'docs/configuration')
| -rw-r--r-- | docs/configuration/cheatsheet.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index 4d18ac30a..85551362c 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -63,6 +63,7 @@ To add configuration to your config file, you can copy it from the base config. * `external_user_synchronization`: Enabling following/followers counters synchronization for external users. * `cleanup_attachments`: Remove attachments along with statuses. Does not affect duplicate files and attachments without status. Enabling this will increase load to database when deleting statuses on larger instances. * `show_reactions`: Let favourites and emoji reactions be viewed through the API (default: `true`). +* `password_reset_token_validity`: The time after which reset tokens aren't accepted anymore, in seconds (default: one day). ## Welcome * `direct_message`: - welcome message sent as a direct message. |