diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-11-03 17:28:54 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-11-03 17:28:54 +0100 |
commit | cd675fbe18bbd9e8c6c0fe9ffb6b3037282cd6c9 (patch) | |
tree | 763163999f72fccbd0440f57d50cf3dca248422c /app/controllers/filters_controller.rb | |
parent | b8e790c3c22693271a4fd74ce34067c462ebf8a3 (diff) | |
parent | f645dad661ba033efdcdd6ca7597e7b8bc7f4f51 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/filters_controller.rb')
-rw-r--r-- | app/controllers/filters_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/filters_controller.rb b/app/controllers/filters_controller.rb index 76be03e53..0d4c1b97c 100644 --- a/app/controllers/filters_controller.rb +++ b/app/controllers/filters_controller.rb @@ -10,7 +10,7 @@ class FiltersController < ApplicationController before_action :set_body_classes def index - @filters = current_account.custom_filters + @filters = current_account.custom_filters.order(:phrase) end def new |