Merge branch 'master' into redux-polling

This commit is contained in:
Juanjo Bazán
2016-12-27 18:22:06 +01:00
235 changed files with 3445 additions and 1099 deletions

View File

@@ -28,7 +28,9 @@ en:
google_login: Google login
debates: Debates
polls: Polls
signature_sheets: Signature sheets
spending_proposals: Investment projects
spending_proposal_features:
voting_allowed: Voting on investment projects
mailer_from_name: Origin email name
mailer_from_address: Origin email address