Merge remote-tracking branch 'origin/develop' into issue-3314-remote-ip-hex
# Conflicts: # mix.exs
This commit is contained in:
commit
512b0f67a4
3 changed files with 3 additions and 4 deletions
1
changelog.d/captcha-package.fix
Normal file
1
changelog.d/captcha-package.fix
Normal file
|
|
@ -0,0 +1 @@
|
|||
Switch native captcha to the published pleroma_captcha Hex package.
|
||||
Loading…
Add table
Add a link
Reference in a new issue