Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch

2020-11-19 17:32:57 +01:00 · 2020-11-19 17:32:57 +01:00 · 5e04f4156c
commit 5e04f4156c
parent b38c3de411 c8d11c3064
7 changed files with 63 additions and 6 deletions
--- a/config/config.exs
+++ b/config/config.exs
@ -264,6 +264,7 @@ config :pleroma, :instance,
    ]
  ],
  show_reactions: true,
+  password_reset_token_validity: 60 * 60 * 24,
  search_function: :websearch

 config :pleroma, :welcome,