aboutsummaryrefslogtreecommitdiff
path: root/src/components/user_card/user_card.js
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2022-01-09 18:37:01 +0000
committerShpuld Shpludson <shp@cock.li>2022-01-09 18:37:01 +0000
commitb13d8f7e6339e877a38a28008630dc8ec64abcdf (patch)
tree56e2103fcb52640a17847cb97a726f9d6d3198ee /src/components/user_card/user_card.js
parent51d3d8d255de221f7ac99e41f2f8e56c7d6a21a9 (diff)
parent756f7bf7c2ee1beb7b43227271942130fd03c7cb (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_card/user_card.js')
-rw-r--r--src/components/user_card/user_card.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index 367fbc6c..cd8ca420 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -5,6 +5,7 @@ import FollowButton from '../follow_button/follow_button.vue'
import ModerationTools from '../moderation_tools/moderation_tools.vue'
import AccountActions from '../account_actions/account_actions.vue'
import Select from '../select/select.vue'
+import RichContent from 'src/components/rich_content/rich_content.jsx'
import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
import { mapGetters } from 'vuex'
import { library } from '@fortawesome/fontawesome-svg-core'
@@ -120,7 +121,8 @@ export default {
AccountActions,
ProgressButton,
FollowButton,
- Select
+ Select,
+ RichContent
},
methods: {
muteUser () {