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/basic_user_card/basic_user_card.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/basic_user_card/basic_user_card.js')
| -rw-r--r-- | src/components/basic_user_card/basic_user_card.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/basic_user_card/basic_user_card.js b/src/components/basic_user_card/basic_user_card.js index 87085a28..8f41e2fb 100644 --- a/src/components/basic_user_card/basic_user_card.js +++ b/src/components/basic_user_card/basic_user_card.js @@ -1,5 +1,6 @@ import UserCard from '../user_card/user_card.vue' import UserAvatar from '../user_avatar/user_avatar.vue' +import RichContent from 'src/components/rich_content/rich_content.jsx' import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator' const BasicUserCard = { @@ -13,7 +14,8 @@ const BasicUserCard = { }, components: { UserCard, - UserAvatar + UserAvatar, + RichContent }, methods: { toggleUserExpanded () { |