Merge password and 2fa page on user settings (#2695)

* merge password and 2fa page on user settings
This commit is contained in:
Lunny Xiao 2017-10-16 17:14:12 +08:00 committed by Kim "BKC" Carlbäcker
parent c1b0c9e7c4
commit 9e865cee67
7 changed files with 117 additions and 89 deletions

View file

@ -303,6 +303,7 @@ form.name_pattern_not_allowed = The username pattern '%s' is not allowed.
[settings]
profile = Profile
password = Password
security = Security
avatar = Avatar
ssh_gpg_keys = SSH / GPG Keys
social = Social Accounts