Merge branch 'master' of https://github.com/fguillot/miniflux

2014-07-23 11:38:43 -03:00 · 2014-07-23 11:38:43 -03:00 · 431c618256
commit 431c618256
parent 88ab144d5c 3bb179b778
2 changed files with 2 additions and 1 deletions
--- a/assets/css/app.css
+++ b/assets/css/app.css
@ -1,3 +1,4 @@
+@-ms-viewport { width: device-width; }
 figure,
 li,
 ul,
--- a/locales/de_DE/translations.php
+++ b/locales/de_DE/translations.php
@ -149,7 +149,7 @@ return array(
    'Unread items' => 'Ungelesene Einträge',
    'Next' => 'Nächster',
    'Previous' => 'Vorheriger',
-    'Sign in' => 'Registrieren',
+    'Sign in' => 'Anmelden',
    'feeds' => 'abonnements',
    'add' => 'hinzufügen',
    'import' => 'importieren',