diff options
| author | lambadalambda <gitgud@rogerbraun.net> | 2017-03-05 14:59:33 -0500 |
|---|---|---|
| committer | lambadalambda <gitgud@rogerbraun.net> | 2017-03-05 14:59:33 -0500 |
| commit | 67c22276d3049576bebeaf4d22e937d759cba06d (patch) | |
| tree | 6c28fb8ddee63c061a8fa01ab35ecf338803b50c /src/components/status_or_conversation | |
| parent | 049c74f8e87e0aa19ee416bb72c987296a3e2dc9 (diff) | |
| parent | 51160f0fdb068f0c9a1133fe66286467b1f4fd78 (diff) | |
Merge branch 'wakarimasen/pleroma-fe-highlight-notice' into 'develop'
Wakarimasen/pleroma fe highlight notice
See merge request !41
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> |