hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix merge conflicts

Browse source
This commit is contained in:
Sean King 2022-08-08 07:32:38 -06:00
commit 325930eecb
No known key found for this signature in database
GPG key ID: 510C52BACD6E7257
11 changed files with 238 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/conversation/conversation.js
View file

@ -3,6 +3,8 @@ import Status from '../status/status.vue'
import ThreadTree from '../thread_tree/thread_tree.vue'
import { WSConnectionStatus } from '../../services/api/api.service.js'
import { mapGetters, mapState } from 'vuex'
import QuickFilterSettings from '../quick_filter_settings/quick_filter_settings.vue'
import QuickViewSettings from '../quick_view_settings/quick_view_settings.vue'
import { library } from '@fortawesome/fontawesome-svg-core'
import {
@ -352,7 +354,9 @@ const conversation = {
},
components: {
Status,
ThreadTree
ThreadTree,
QuickFilterSettings,
QuickViewSettings
},
watch: {
statusId (newVal, oldVal) {