Merge branch 'master' into glitch-soc/merge-upstream

2020-01-07 16:28:59 +01:00
parent bcfd6e3bb4 345dd93310
commit 578553ba05
7 changed files with 113 additions and 95 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -757,6 +757,7 @@ en:
      invalid_irreversible: Irreversible filtering only works with home or notifications context
    index:
      delete: Delete
+      empty: You have no filters.
      title: Filters
    new:
      title: Add new filter