Merge branch 'issue/209' into 'develop'
authorlain <lain@soykaf.club>
Thu, 7 May 2020 08:14:54 +0000 (08:14 +0000)
committerlain <lain@soykaf.club>
Thu, 7 May 2020 08:14:54 +0000 (08:14 +0000)
commitf4c2bf0985f3d65d9caa6f02a71c89db9f070fb1
treea7f4ece6dcd0a534b464e455fa382d3ebd8f4d07
parent68a126317d7cdd670c8e244319da08ff85639d33
parent3d0c567fbc3506770fdac5f1269c45b244928747
Merge branch 'issue/209' into 'develop'

[#209] 2FA/two_factor_authentication support

See merge request pleroma/pleroma!801