Merge branch 'master' into legislation-module-stable

2016-12-27 16:43:43 +01:00
parent 704dffe7c5 4e1bb62654
commit 04b23cfc7b
40 changed files with 779 additions and 22 deletions
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -95,6 +95,8 @@ search:
 # - '{devise,simple_form}.*'
 ignore_missing:
  - 'unauthorized.*'
+  - 'activerecord.models.proposal'
+  - 'activerecord.models.spending_proposal'
  - 'activerecord.errors.models.proposal_notification.*'
  - 'activerecord.errors.models.direct_message.*'
  - 'errors.messages.blank'