Merge branch 'oauth' into 'develop'

Move login to oauth.

See merge request pleroma/pleroma-fe!367
This commit is contained in:
lambda 2018-11-13 18:42:07 +00:00
commit 11f8a4f312
19 changed files with 1412 additions and 244 deletions

View file

@ -21,6 +21,7 @@
},
"login": {
"login": "Anmelden",
"description": "Mit OAuth anmelden",
"logout": "Abmelden",
"password": "Passwort",
"placeholder": "z.B. lain",

View file

@ -21,6 +21,7 @@
},
"login": {
"login": "Log in",
"description": "Log in with OAuth",
"logout": "Log out",
"password": "Password",
"placeholder": "e.g. lain",