diff options
| author | Shpuld Shpludson <shp@cock.li> | 2022-01-09 18:37:01 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2022-01-09 18:37:01 +0000 |
| commit | b13d8f7e6339e877a38a28008630dc8ec64abcdf (patch) | |
| tree | 56e2103fcb52640a17847cb97a726f9d6d3198ee /src/components/user_profile/user_profile.js | |
| parent | 51d3d8d255de221f7ac99e41f2f8e56c7d6a21a9 (diff) | |
| parent | 756f7bf7c2ee1beb7b43227271942130fd03c7cb (diff) | |
Merge branch 'develop' into 'master'
Update MASTER for 2.4.2
See merge request pleroma/pleroma-fe!1421
Diffstat (limited to 'src/components/user_profile/user_profile.js')
| -rw-r--r-- | src/components/user_profile/user_profile.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js index c0b55a6c..7a475609 100644 --- a/src/components/user_profile/user_profile.js +++ b/src/components/user_profile/user_profile.js @@ -4,6 +4,7 @@ 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 RichContent from 'src/components/rich_content/rich_content.jsx' import List from '../list/list.vue' import withLoadMore from '../../hocs/with_load_more/with_load_more' import { library } from '@fortawesome/fontawesome-svg-core' @@ -164,7 +165,8 @@ const UserProfile = { FriendList, FollowCard, TabSwitcher, - Conversation + Conversation, + RichContent } } |