diff options
| author | shpuld <shp@cock.li> | 2019-03-23 22:21:57 +0200 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2019-03-23 22:21:57 +0200 |
| commit | fd12263cacd2a869ad61dd8580f918b45d9b2a51 (patch) | |
| tree | c70c4e548923d97893ab6a875cc354cd6895f8e8 /src/components/user_profile/user_profile.vue | |
| parent | 85584021fb1042a8934945d73f7d25b38f1c29d1 (diff) | |
| parent | f86a5dc80421f496a893efaa98f12f831da0adcb (diff) | |
merge develop in
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" |