diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-09-09 21:51:39 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-09-09 21:51:39 +0000 |
| commit | 370f1e55adddd60a22bf56a7782ba61f239eb13c (patch) | |
| tree | 3a4c897ac420b8d6ab92b31e2779f88947016eed /src/components/user_card/user_card.js | |
| parent | f35e3d0f3fc1a6bb4ebd77fba1dce0ac27f5b7d7 (diff) | |
| parent | a8a82ad12f2f7b9eb8fe7a57a3a7d503c6bbe2ed (diff) | |
Merge branch 'develop' into 'themeApply'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'src/components/user_card/user_card.js')
| -rw-r--r-- | src/components/user_card/user_card.js | 4 |
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 () { |