merges master and fixes conflicts

2015-08-17 02:40:11 +02:00
parent 543f718891 8c6081c163
commit 8ca546a431
220 changed files with 14524 additions and 17665 deletions
--- a/config/locales/activerecord.en.yml
+++ b/config/locales/activerecord.en.yml
@@ -3,6 +3,7 @@ en:
    models:
      comment: Comment
      debate: Debate
+      tag: Topic
      user: User
      vote: Vote
      organization: Organization
@@ -21,5 +22,6 @@ en:
        last_name: "Last name"
        nickname: Nickname
        password: Password
+        phone_number: Phone number
      organization:
        name: Organization name