diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-03-09 09:19:40 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-03-09 09:19:40 +0100 |
| commit | 2f52669380703030aa8e197deb05240c5f3bf979 (patch) | |
| tree | 5b40b0d4efd3d132c8bdd321092ce2bd5fb8a0e6 /src/components/status_or_conversation | |
| parent | c921662036fe39f5146d5a36b4b018af3cfc2635 (diff) | |
| parent | 64d71b75cfed41d82a99e3e478fc75d5f81f84bd (diff) | |
Merge branch 'develop' into wakarimasen/pleroma-fe-develop
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 1e21bdcd..9647d5eb 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" :inConversation="false" :statusoid="statusoid"></status> + <status v-if="!expanded" @toggleExpanded="toggleExpanded" :expandable="true" :inConversation="false" :focused="false" :statusoid="statusoid"></status> </div> </template> |