aboutsummaryrefslogtreecommitdiff
path: root/src/components/user_settings/mfa.vue
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-06-22 12:51:51 +0000
committerlain <lain@soykaf.club>2020-06-22 12:51:51 +0000
commitbbb91d8ae3f1c3d5374de7610e723e63121e8222 (patch)
tree0b923bcbbb48bdbb10ee071cdb0c119d0ea73470 /src/components/user_settings/mfa.vue
parent1afa0f004455175e5bc1770cae5c7833a1a0e84f (diff)
parent2b6d16900b9f0bd515dbb616ef0f031f6c026dcc (diff)
Merge branch 'feature/bot-flag' into 'develop'
Add 'Bot' settings option and badge Closes #832 See merge request pleroma/pleroma-fe!1153
Diffstat (limited to 'src/components/user_settings/mfa.vue')
0 files changed, 0 insertions, 0 deletions