diff options
| author | shpuld <shpuld@gmail.com> | 2017-03-06 14:51:01 +0200 |
|---|---|---|
| committer | shpuld <shpuld@gmail.com> | 2017-03-06 14:51:01 +0200 |
| commit | 31c0a2dfef565bc665ebe6c4d8102249eefc6869 (patch) | |
| tree | 6f24d32bf47634aa9f4d81c6041e18dd39fe1f3c /src/components/status_or_conversation | |
| parent | e19bfb9a22f1db562de7079b71dee6e53a8a54fb (diff) | |
| parent | 67c22276d3049576bebeaf4d22e937d759cba06d (diff) | |
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/load-new-statuses-in-heading
Diffstat (limited to 'src/components/status_or_conversation')
| -rw-r--r-- | src/components/status_or_conversation/status_or_conversation.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/status_or_conversation/status_or_conversation.vue b/src/components/status_or_conversation/status_or_conversation.vue index 4fabfab2..4aaaf2ff 100644 --- a/src/components/status_or_conversation/status_or_conversation.vue +++ b/src/components/status_or_conversation/status_or_conversation.vue @@ -1,7 +1,7 @@ <template> <div> <conversation v-if="expanded" @toggleExpanded="toggleExpanded" :collapsable="true" :statusoid="statusoid"></conversation> - <status v-if="!expanded" @toggleExpanded="toggleExpanded" :expandable="true" :statusoid="statusoid"></status> + <status v-if="!expanded" @toggleExpanded="toggleExpanded" :expandable="true" :statusoid="statusoid" :focused="false"></status> </div> </template> |