diff options
| author | Sean King <seanking2919@protonmail.com> | 2022-08-08 07:32:38 -0600 |
|---|---|---|
| committer | Sean King <seanking2919@protonmail.com> | 2022-08-08 07:32:38 -0600 |
| commit | 325930eecb4943bb50344159646a7c62b4bf10b3 (patch) | |
| tree | c28dd669ccdf7416a48cfded0a7b581225e54c5d /src/components/conversation/conversation.vue | |
| parent | 04e62df377fdd2ea563f58dcd23ea8048fc1c140 (diff) | |
| parent | 068139b27e00137cb1423c0a7751572c54a52148 (diff) | |
Fix merge conflicts
Diffstat (limited to 'src/components/conversation/conversation.vue')
| -rw-r--r-- | src/components/conversation/conversation.vue | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 1adbe250..61832566 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -17,6 +17,14 @@ > {{ $t('timeline.collapse') }} </button> + <QuickFilterSettings + v-if="!collapsable" + :conversation="true" + /> + <QuickViewSettings + v-if="!collapsable" + :conversation="true" + /> </div> <div class="conversation-body panel-body"> <div |