diff options
| author | dave <starpumadev@gmail.com> | 2019-03-29 10:11:28 -0400 |
|---|---|---|
| committer | dave <starpumadev@gmail.com> | 2019-03-29 10:11:28 -0400 |
| commit | 783cc00dd0ea24b98bc8442b60c91be387428a7e (patch) | |
| tree | 216663f5877e9f444009b3b8ef900aa646202d4c /src/components/timeline/timeline.vue | |
| parent | 5fd589d5e717bbcbc46db5efb35878b993b6dfbc (diff) | |
| parent | 25370083b63328ad489f4f0676a4bfa33de59671 (diff) | |
merge develop & resolve conflict
Diffstat (limited to 'src/components/timeline/timeline.vue')
| -rw-r--r-- | src/components/timeline/timeline.vue | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 8f28d65c..e0a34bd1 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -16,7 +16,13 @@ </div> <div :class="classes.body"> <div class="timeline"> - <status-or-conversation v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status" class="status-fadein"></status-or-conversation> + <conversation + v-for="status in timeline.visibleStatuses" + class="status-fadein" + :key="status.id" + :statusoid="status" + :collapsable="true" + /> </div> </div> <div :class="classes.footer"> |