diff options
| author | Shpuld Shpuldson <shpuld@gmail.com> | 2017-03-10 07:12:04 -0500 |
|---|---|---|
| committer | Shpuld Shpuldson <shpuld@gmail.com> | 2017-03-10 07:12:04 -0500 |
| commit | 33f72ab2c215ebd7709edaf7a63062aabe8363cc (patch) | |
| tree | a2cec29e4afab22aeec5e7ed41b25a19263402d3 /src/components/status_or_conversation | |
| parent | bfbbb527677ba4648b1be376bb02b0bd3c3e29ba (diff) | |
| parent | 896de016adbabd142c09476a323f4e02cefa88c9 (diff) | |
Merge branch 'wakarimasen/pleroma-fe-develop' into 'develop'
Wakarimasen/pleroma fe develop
See merge request !55
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 4aaaf2ff..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" :statusoid="statusoid" :focused="false"></status> + <status v-if="!expanded" @toggleExpanded="toggleExpanded" :expandable="true" :inConversation="false" :focused="false" :statusoid="statusoid"></status> </div> </template> |