gurix/ch420
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into features/publicity

Browse Source 
# Conflicts:
#	.gitignore
This commit is contained in:
gurix
2017-04-18 16:22:36 +02:00
parent 93dc7b0c50 cb1bf34588
commit 8cb8aea9ca
13 changed files with 11 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/locales/de.yml
-1
View File
@@ -131,7 +131,6 @@ de:
remember_me: Angemeldet bleiben
password: Passwort
language: Sprache
unsubscribed: Kein Newsletter
password_confirmation: Passwort bestätigen
current_password: Aktuelles Passwort
publicity: