diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-03-09 09:00:09 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-03-09 09:00:09 +0100 |
| commit | b11c1f57a95e689a751c4dff72ebe7aabc9c0601 (patch) | |
| tree | b2596b07c3482c76493cc61974932cdf33e296ab /src/components/status_or_conversation | |
| parent | 502757da28d573641a48197c284b7e40dfc8154e (diff) | |
| parent | ba4f7ef3efe15aaebce523113283b5854d16ceb8 (diff) | |
Merge branch 'develop' into xj9/pleroma-fe-feature/even-better-nsfw-image-loading
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> |