Merge branch 'v1.5.1-coolaj86' into gitroast

This commit is contained in:
AJ ONeal 2018-10-08 22:58:43 -06:00
commit e09a6248f1
1 ha cambiato i file con 1 aggiunte e 1 eliminazioni

Vedi File

@ -223,7 +223,7 @@ twofa_scratch_token_incorrect = Your scratch code is incorrect.
login_userpass = Sign In
login_openid = OpenID
oauth_signup_tab = Register New Account
oauth_signup_title = Add Email and Password (for Account Recovery)
oauth_signup_title = Add Account Recovery Info
oauth_signup_submit = Complete Account
oauth_signin_tab = Link to Existing Account
oauth_signin_title = Sign In to Authorize Linked Account