Merge branch 'master' into notifications

2016-01-08 12:46:28 +01:00
parent 40ffeeaeb0 017bfe9146
commit de51bb0f79
19 changed files with 119 additions and 251 deletions
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -121,8 +121,10 @@ ignore_unused:
  - 'moderation.debates.index.filter*'
  - 'moderation.debates.index.order*'
  - 'users.show.filters.*'
+  - 'debates.index.select_order'
  - 'debates.index.orders.*'
  - 'debates.index.search_form.*'
+  - 'proposals.index.select_order'
  - 'proposals.index.orders.*'
  - 'proposals.index.search_form.*'
  - 'notifications.index.commented_on_your_debate'