diff options
| author | pluralcafe-docker <docker@plural.cafe> | 2018-08-22 08:26:56 +0000 |
|---|---|---|
| committer | pluralcafe-docker <docker@plural.cafe> | 2018-08-22 08:26:56 +0000 |
| commit | a4935a8e24dcfa865fb330693d8ec90beca1aa98 (patch) | |
| tree | 9fc0be073bc2ed5bf4231d850106f214fdeb020e /app/javascript/flavours/glitch/actions | |
| parent | c339d49d82b3fd2873831029d9c92b3fbf1236e3 (diff) | |
| parent | 37965ac8d9773ae79f6b8dd6fcd353894d2194ca (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/javascript/flavours/glitch/actions')
| -rw-r--r-- | app/javascript/flavours/glitch/actions/timelines.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/actions/timelines.js b/app/javascript/flavours/glitch/actions/timelines.js index 9597fe89d..7f1ff8e3b 100644 --- a/app/javascript/flavours/glitch/actions/timelines.js +++ b/app/javascript/flavours/glitch/actions/timelines.js @@ -72,7 +72,7 @@ export function expandTimeline(timelineId, path, params = {}, done = noOp) { return; } - if (!params.max_id && timeline.get('items', ImmutableList()).size > 0) { + if (!params.max_id && !params.pinned && timeline.get('items', ImmutableList()).size > 0) { params.since_id = timeline.getIn(['items', 0]); } |