Merge branch 'master' into features/publicity

# Conflicts: # .gitignore
2017-04-18 16:22:36 +02:00
parent 93dc7b0c50 cb1bf34588
commit 8cb8aea9ca
13 changed files with 11 additions and 81 deletions
@@ -127,7 +127,6 @@ fr:
        remember_me: Se souvenir de moi
        password: mot de passe
        language: Langue
-        unsubscribed: pas de newslettre
        password_confirmation: confirmer le mot de passe
        current_password: Mot de passe actuel