diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-03-10 13:27:58 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-03-10 13:27:58 +0100 |
| commit | 112adcf8f83e1bd8dd347ef8ee4de46060b53341 (patch) | |
| tree | aa6288f000d72dfd2f166642d413637a77f1aa42 /src/components/status_or_conversation | |
| parent | 0eeccb87cef4d137710e3c7fd215b94e45aff3d1 (diff) | |
| parent | 33f72ab2c215ebd7709edaf7a63062aabe8363cc (diff) | |
Merge branch 'develop' into feature/hash-routed
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> |