From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Fri, 17 Apr 2020 09:19:35 +0000 (+0000)
Subject: Merge branch 'feature/1584-client-captcha-options' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a17bfb5fababbe25fa2abcfccd013c9f3edc2ef7;p=akkoma

Merge branch 'feature/1584-client-captcha-options' into 'develop'

Creating trusted app from adminFE & mix task

Closes #1584

See merge request pleroma/pleroma!2252
---

a17bfb5fababbe25fa2abcfccd013c9f3edc2ef7