-
Alexis Reigel authored
(cherry picked from commit fae85677212906bb8dce2bf5dc797a71d1ee9d1b) Conflicts: app/helpers/sorting_helper.rb
dbcee512
(cherry picked from commit fae85677212906bb8dce2bf5dc797a71d1ee9d1b) Conflicts: app/helpers/sorting_helper.rb