summaryrefslogtreecommitdiff
path: root/app/views/shared
diff options
context:
space:
mode:
authorPeter Kozak <spag@golwen.net>2012-12-20 10:03:24 +0100
committerPeter Kozak <spag@golwen.net>2012-12-20 10:03:24 +0100
commite405bce6ab07f385e32c0d885b1d51ca96bf1ff5 (patch)
tree510ced8b7d925f46292ee872d04aaa25a9d0a17f /app/views/shared
parent6bf23a88899522a52740113a3cfdccc7ae533fca (diff)
parent5c270c981a21d9aafaecb3b59b98dfa6a3d9d97f (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views/shared')
-rw-r--r--app/views/shared/_header.de.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/_header.de.html.haml b/app/views/shared/_header.de.html.haml
index c6205ae..10ad2a0 100644
--- a/app/views/shared/_header.de.html.haml
+++ b/app/views/shared/_header.de.html.haml
@@ -37,5 +37,5 @@
- else
.user-context
= link_to "Registrieren", sign_up_path
- oder
+ or
= link_to "Anmelden", log_in_path