Merge branch 'master' into features/publicity

# Conflicts:
#	.gitignore
This commit is contained in:
2017-04-18 16:22:36 +02:00
13 changed files with 11 additions and 81 deletions
-1
View File
@@ -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: