Merge branch 'master' into reorganize_header

This commit is contained in:
Alberto Garcia Cabeza
2015-08-21 13:05:21 +02:00
10 changed files with 34 additions and 17 deletions

View File

@@ -13,7 +13,7 @@ en:
open_city_slogan: So the citizens can decide what kind of city they want.
see_all_debates: See all debates
my_account_link: My account
language: Site language
locale: "Site language:"
administration: Administration
moderation: Moderation
welcome: Welcome