diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-08-01 22:20:25 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-01 22:20:25 +0200 |
commit | bf1d3ae3b83726816c78ca6cb40af24d48390bd9 (patch) | |
tree | 29c156a7d145f2ec88e4bb708d329202598bdf35 /app/controllers/accounts_controller.rb | |
parent | 71b318dedc5f39382cb15250417429427a69166b (diff) | |
parent | 4da03a298a20e5007718764483544593556a5ed4 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: config/settings.yml
Diffstat (limited to 'app/controllers/accounts_controller.rb')
-rw-r--r-- | app/controllers/accounts_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 723da665e..35ee5cca9 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -52,7 +52,7 @@ class AccountsController < ApplicationController private def show_pinned_statuses? - [replies_requested?, media_requested?, params[:max_id].present?, params[:since_id].present?].none? + [replies_requested?, media_requested?, params[:max_id].present?, params[:min_id].present?].none? end def filtered_statuses |