Merge branch 'master' into features/publicity
# Conflicts: # .gitignore
This commit is contained in:
@@ -128,7 +128,6 @@ it:
|
||||
remember_me: Ricordati di mel
|
||||
password: Password
|
||||
language: Lingua
|
||||
unsubscribed: No Newsletter
|
||||
password_confirmation: conferma password
|
||||
current_password: Password corrente
|
||||
publicity:
|
||||
|
||||
Reference in New Issue
Block a user