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 /config/config.exs | |
| parent | e164c37139c4365d7d46a2a990b364ad26dfdbf7 (diff) | |
| parent | c8d11c306452ea36f5690ba1824434dc71bd9f95 (diff) | |
| download | pleroma-b27d8f74370ad404a91b15fa1f51ea6162f35098.tar.gz pleroma-b27d8f74370ad404a91b15fa1f51ea6162f35098.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 1ac140ed0..be5257663 100644 --- a/config/config.exs +++ b/config/config.exs @@ -263,7 +263,8 @@ config :pleroma, :instance, length: 16 ] ], - show_reactions: true + show_reactions: true, + password_reset_token_validity: 60 * 60 * 24 config :pleroma, :welcome, direct_message: [ |