diff options
| author | lambadalambda <gitgud@rogerbraun.net> | 2017-06-05 06:19:41 -0400 |
|---|---|---|
| committer | lambadalambda <gitgud@rogerbraun.net> | 2017-06-05 06:19:41 -0400 |
| commit | 449a466ef2a071db07fb63dddf5b7dad704000ec (patch) | |
| tree | ef75d940d4f573aa233ca114c1ebd4619d13dcd2 /src/components/conversation/conversation.vue | |
| parent | a4493f05d319e31d677dcf9cf0835d945e37e998 (diff) | |
| parent | 9af18e014d5bd6d342e6741927e37cb787d63458 (diff) | |
Merge branch 'feature/two-way-reply-navigation' into 'develop'
Feature/two way reply navigation
See merge request !88
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 8b1e00ac..96e8a5d7 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" @goto="setHighlight" :key="status.id" :statusoid="status" :expandable='false' :focused="focused(status.id)" :inConversation='true' :highlight="highlight"></status> + <status v-for="status in conversation" @goto="setHighlight" :key="status.id" :statusoid="status" :expandable='false' :focused="focused(status.id)" :inConversation='true' :highlight="highlight" :replies="getReplies(status.id)"></status> </div> </div> </div> |