hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks

Browse source 
# Conflicts:
#	lib/pleroma/user.ex
This commit is contained in:
Ivan Tashkinov 2020-01-10 16:18:32 +03:00
commit 39ce894a07
39 changed files with 1261 additions and 1964 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/config.exs
View file

@ -67,7 +67,7 @@ config :pleroma, Pleroma.Scheduler,
config :pleroma, Pleroma.Captcha,
enabled: true,
seconds_valid: 3000,
seconds_valid: 300,
method: Pleroma.Captcha.Native
config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"