aboutsummaryrefslogtreecommitdiff
path: root/src/components/search/search.js
diff options
context:
space:
mode:
authormarcin mikołajczak <git@mkljczk.pl>2022-08-05 11:53:44 +0200
committermarcin mikołajczak <git@mkljczk.pl>2022-08-05 11:53:44 +0200
commit6649baaac94348bbf09015eeb2c8eeea714096db (patch)
tree6793738e657b087b5f0aa556dc7a82a79e2ccb1f /src/components/search/search.js
parent79d02bddbe2b77574844b8ade7a09043c31b1c6b (diff)
parent610720f164dc9fcf36f9df33bddec5ac9c654e1e (diff)
Merge remote-tracking branch 'pleroma/develop' into birthdays
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Diffstat (limited to 'src/components/search/search.js')
-rw-r--r--src/components/search/search.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/search/search.js b/src/components/search/search.js
index b62bc2c5..76ac30ef 100644
--- a/src/components/search/search.js
+++ b/src/components/search/search.js
@@ -1,6 +1,7 @@
import FollowCard from '../follow_card/follow_card.vue'
import Conversation from '../conversation/conversation.vue'
import Status from '../status/status.vue'
+import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
import map from 'lodash/map'
import { library } from '@fortawesome/fontawesome-svg-core'
import {
@@ -17,7 +18,8 @@ const Search = {
components: {
FollowCard,
Conversation,
- Status
+ Status,
+ TabSwitcher
},
props: [
'query'