From: lain <lain@soykaf.club>
Date: Thu, 7 May 2020 08:14:54 +0000 (+0000)
Subject: Merge branch 'issue/209' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=f4c2bf0985f3d65d9caa6f02a71c89db9f070fb1;p=akkoma

Merge branch 'issue/209' into 'develop'

[#209] 2FA/two_factor_authentication support

See merge request pleroma/pleroma!801
---

f4c2bf0985f3d65d9caa6f02a71c89db9f070fb1