diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-07-06 20:43:38 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-07-06 20:43:38 +0000 |
| commit | 8f5379642029f730aa3d905c6980433c6c901486 (patch) | |
| tree | 2888a000a85d77c221a61bac44e2b246b2f068ff /src/components/timeline | |
| parent | 8d6750d9c2816e33a0444cd978f94009d8b85d47 (diff) | |
| parent | 60b413d02c4be5b3f24ff984e43090620d9a59e1 (diff) | |
Merge branch 'develop' into 'eslint-fix'
# Conflicts:
# src/components/post_status_form/post_status_form.vue
Diffstat (limited to 'src/components/timeline')
| -rw-r--r-- | src/components/timeline/timeline.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index 791a8e45..5e24bd15 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -86,7 +86,7 @@ const Timeline = { if (this.newStatusCount === 0) return if (this.timeline.flushMarker !== 0) { - this.$store.commit('clearTimeline', { timeline: this.timelineName }) + this.$store.commit('clearTimeline', { timeline: this.timelineName, excludeUserId: true }) this.$store.commit('queueFlush', { timeline: this.timelineName, id: 0 }) this.fetchOlderStatuses() } else { |