Merge branch 'feature/native-captcha' into 'develop'

Browse source

Add native captcha and enable it by default.

Closes #1017 and #1405

See merge request pleroma/pleroma!2060

...

This commit is contained in:

lain 2019-12-12 18:43:21 +00:00

parent 8ad6d2784c 470a3a678d

commit 2f31cef71f

9 changed files with 69 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

0

priv/static/static/font/fontello.1576166651574.svg Normal file → Executable file

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 22 KiB