diff options
| author | dave <starpumadev@gmail.com> | 2019-03-25 10:22:16 -0400 |
|---|---|---|
| committer | dave <starpumadev@gmail.com> | 2019-03-25 10:22:16 -0400 |
| commit | 4cec0d589dfc54987ec6f024b0a463d0abd847d2 (patch) | |
| tree | a88953cc409d162127edb43a702d6540c64c023e /src/components/user_profile/user_profile.vue | |
| parent | 63d7c7bd80cf8028cdefee99c1cb75614385f96b (diff) | |
| parent | 01d05316998f90451e920f8ac8d4c264a13b0cd7 (diff) | |
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form
Diffstat (limited to 'src/components/user_profile/user_profile.vue')
| -rw-r--r-- | src/components/user_profile/user_profile.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index 7d4a8b1f..d449eb85 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -11,7 +11,7 @@ :title="$t('user_profile.timeline_title')" :timeline="timeline" :timeline-name="'user'" - :user-id="fetchBy" + :user-id="userId" /> <div :label="$t('user_card.followees')" v-if="followsTabVisible" :disabled="!user.friends_count"> <FriendList :userId="userId" /> @@ -25,7 +25,7 @@ :embedded="true" :title="$t('user_card.media')" timeline-name="media" :timeline="media" - :user-id="fetchBy" + :user-id="userId" /> <Timeline v-if="isUs" |