diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-08-07 17:36:05 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-08-07 17:36:05 +0000 |
| commit | 068139b27e00137cb1423c0a7751572c54a52148 (patch) | |
| tree | 40c0068aebcd12ecac432d57949d631ef5545eef /src/components/timeline/timeline.vue | |
| parent | 610720f164dc9fcf36f9df33bddec5ac9c654e1e (diff) | |
| parent | 09f3783647ff9e0c194e0e0c71b78e98109635b6 (diff) | |
Merge branch 'timeline-view-menu' into 'develop'
Quick View Menu for timeline and conversations, filter for conversations
Closes #1179
See merge request pleroma/pleroma-fe!1578
Diffstat (limited to 'src/components/timeline/timeline.vue')
| -rw-r--r-- | src/components/timeline/timeline.vue | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 266c1d9a..627cafbb 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -16,7 +16,8 @@ > {{ $t('timeline.up_to_date') }} </div> - <TimelineQuickSettings v-if="!embedded" /> + <QuickFilterSettings v-if="!embedded" /> + <QuickViewSettings v-if="!embedded" /> </div> <div :class="classes.body"> <div |