diff options
| author | shpuld <shp@cock.li> | 2019-02-04 19:49:23 +0200 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2019-02-04 19:49:23 +0200 |
| commit | 54e7e0e31babbfb0c4ebc2e1a73012e1b1890231 (patch) | |
| tree | 7533728f9f115f877806694960dcaeb48d28dbd7 /src/components/user_card/user_card.js | |
| parent | 18ae7bd5f366598d46a65e9da1312c98f7bb00e7 (diff) | |
| parent | 3cd1deb133926281920f10c1ddd6eb694c09f44d (diff) | |
merge develop and fix conflicts AGAIN
Diffstat (limited to 'src/components/user_card/user_card.js')
| -rw-r--r-- | src/components/user_card/user_card.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js index 615e6487..ecc36a4d 100644 --- a/src/components/user_card/user_card.js +++ b/src/components/user_card/user_card.js @@ -1,5 +1,5 @@ import UserCardContent from '../user_card_content/user_card_content.vue' -import StillImage from '../still-image/still-image.vue' +import UserAvatar from '../user_avatar/user_avatar.vue' import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator' const UserCard = { @@ -15,7 +15,7 @@ const UserCard = { }, components: { UserCardContent, - StillImage + UserAvatar }, computed: { currentUser () { return this.$store.state.users.currentUser } |