diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-06-08 13:30:49 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-06-08 13:30:49 +0000 |
| commit | af47d51cd14503495c1ee7398ba733ad4c5ed4a4 (patch) | |
| tree | bf2b0df49756e72800a0f34bd5c26d4fb9beabeb /src/components/user_profile/user_profile.vue | |
| parent | 9b86fc4dcd05a8f63ff564e117f06caf8046be78 (diff) | |
| parent | e2c5e4eb46143b52ccff21ca0914c5f1b79376fa (diff) | |
Merge branch 'develop' into 'patch-1'
# Conflicts:
# src/i18n/messages.js
Diffstat (limited to 'src/components/user_profile/user_profile.vue')
| -rw-r--r-- | src/components/user_profile/user_profile.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index 838a43ab..f8502907 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -1,7 +1,7 @@ <template> <div> <div v-if="user" class="user-profile panel panel-default"> - <user-card-content :user="user" :switcher="true"></user-card-content> + <user-card-content :user="user" :switcher="true" :selected="timeline.viewing"></user-card-content> </div> <Timeline :title="$t('user_profile.timeline_title')" :timeline="timeline" :timeline-name="'user'" :user-id="userId"/> </div> |