fixes conflicts with master

2015-10-14 15:48:55 +02:00
parent 68b866171b 77bacdc3ec
commit e08ed41e98
63 changed files with 1394 additions and 1677 deletions
--- a/config/locales/activerecord.en.yml
+++ b/config/locales/activerecord.en.yml
@@ -40,3 +40,13 @@ en:
      organization:
        name: Organization name
        responsible_name: Person in charge
+    errors:
+      models:
+        debate:
+          attributes:
+            tag_list:
+              less_than_or_equal_to: tags must be less than or equal to %{count}
+        proposal:
+          attributes:
+            tag_list:
+              less_than_or_equal_to: tags must be less than or equal to %{count}