]> source.dussan.org Git - gitea.git/commit
Merge password and 2fa page on user settings (#2695)
authorLunny Xiao <xiaolunwen@gmail.com>
Mon, 16 Oct 2017 09:14:12 +0000 (17:14 +0800)
committerKim "BKC" Carlbäcker <kim.carlbacker@gmail.com>
Mon, 16 Oct 2017 09:14:12 +0000 (11:14 +0200)
commit9e865cee67728486959a4fcbbf2112a57df7e331
tree990ce63731e753ed1f71c4e1bffbb541a02195f7
parentc1b0c9e7c4bbb669ea03694c30c9ff66a109ef17
Merge password and 2fa page on user settings (#2695)

* merge password and 2fa page on user settings
integrations/links_test.go
options/locale/locale_en-US.ini
routers/routes/routes.go
routers/user/setting.go
templates/user/settings/navbar.tmpl
templates/user/settings/password.tmpl [deleted file]
templates/user/settings/security.tmpl [new file with mode: 0644]