From: lain <lain@soykaf.club>
Date: Thu, 12 Dec 2019 18:43:21 +0000 (+0000)
Subject: Merge branch 'feature/native-captcha' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=2f31cef71f377cf660f818e7e204436f2070bd78;p=akkoma

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

Add native captcha and enable it by default.

Closes #1017 and #1405

See merge request pleroma/pleroma!2060
---

2f31cef71f377cf660f818e7e204436f2070bd78
diff --cc priv/static/static/font/fontello.1576166651574.svg
index f5e497ce4,f5e497ce4..f5e497ce4
mode 100644,100755..100755
--- a/priv/static/static/font/fontello.1576166651574.svg
+++ b/priv/static/static/font/fontello.1576166651574.svg