Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into feat/report-notification

2022-07-18 12:33:03 +02:00 · 2022-07-18 12:33:03 +02:00 · 18d69f93d3
commit 18d69f93d3
parent e594252668 9ddb43296f
217 changed files with 6246 additions and 4489 deletions
--- a/src/components/interactions/interactions.js
+++ b/src/components/interactions/interactions.js
@ -1,4 +1,5 @@
 import Notifications from '../notifications/notifications.vue'
+import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'

 const tabModeDict = {
  mentions: ['mention'],
@ -23,7 +24,8 @@ const Interactions = {
    }
  },
  components: {
-    Notifications
+    Notifications,
+    TabSwitcher
  }
 }