diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-06-06 21:24:47 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-06-06 21:24:47 +0000 |
| commit | a5de8db579f6c50c1bbe5659e82bc29eaa588e7f (patch) | |
| tree | 9ab84c6012e3cb68484514920817862b91f1c25d /src/components/user_profile/user_profile.js | |
| parent | e47d0f210317c6e04e15fb89eb8f1d469137b779 (diff) | |
| parent | 68482fd3a6870514c7e8bd0fe433f24711e97ce9 (diff) | |
Merge branch 'settings-modal' into 'develop'
Settings modal
See merge request pleroma/pleroma-fe!1118
Diffstat (limited to 'src/components/user_profile/user_profile.js')
| -rw-r--r-- | src/components/user_profile/user_profile.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js index 9558a0bd..95760bf8 100644 --- a/src/components/user_profile/user_profile.js +++ b/src/components/user_profile/user_profile.js @@ -3,6 +3,7 @@ import UserCard from '../user_card/user_card.vue' import FollowCard from '../follow_card/follow_card.vue' import Timeline from '../timeline/timeline.vue' import Conversation from '../conversation/conversation.vue' +import TabSwitcher from 'src/components/tab_switcher/tab_switcher.js' import List from '../list/list.vue' import withLoadMore from '../../hocs/with_load_more/with_load_more' @@ -146,6 +147,7 @@ const UserProfile = { FollowerList, FriendList, FollowCard, + TabSwitcher, Conversation } } |
