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/conversation/conversation.vue | |
| 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/conversation/conversation.vue')
| -rw-r--r-- | src/components/conversation/conversation.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 33a43e15..331cce99 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -8,7 +8,7 @@ </div> <div class="panel-body"> <div class="timeline"> - <status v-for="status in conversation" :key="status.id" v-bind:statusoid="status":expandable='false':focused="focused(status.id)"></status> + <status v-for="status in conversation" :key="status.id" :statusoid="status" :expandable='false' :focused="focused(status.id)" :inConversation='true'></status> </div> </div> </div> |