Merge remote-tracking branch 'origin/develop' into been-awhile

* origin/develop:
  lint
  fix bugs
  Apply 1 suggestion(s) to 1 file(s)
  change icons
  Update dependency vue-i18n to v9.2.0
  made quick settings into their own component, added quick view settings, added both to conversation view

1 files changed, 5 insertions, 1 deletions

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 3b540cac..712e2a2c 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -1,6 +1,8 @@
 import { reduce, filter, findIndex, clone, get } from 'lodash'
 import Status from '../status/status.vue'
 import ThreadTree from '../thread_tree/thread_tree.vue'
+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 {
@@ -343,7 +345,9 @@ const conversation = {
   },
   components: {
     Status,
-    ThreadTree
+    ThreadTree,
+    QuickFilterSettings,
+    QuickViewSettings
   },
   watch: {
     statusId (newVal, oldVal) {