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/conversation-page/conversation-page.vue | |
| parent | 5fd589d5e717bbcbc46db5efb35878b993b6dfbc (diff) | |
| parent | 25370083b63328ad489f4f0676a4bfa33de59671 (diff) | |
merge develop & resolve conflict
Diffstat (limited to 'src/components/conversation-page/conversation-page.vue')
| -rw-r--r-- | src/components/conversation-page/conversation-page.vue | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/components/conversation-page/conversation-page.vue b/src/components/conversation-page/conversation-page.vue index b03eea28..9e322cf5 100644 --- a/src/components/conversation-page/conversation-page.vue +++ b/src/components/conversation-page/conversation-page.vue @@ -1,5 +1,9 @@ <template> - <conversation :collapsable="false" :statusoid="statusoid"></conversation> + <conversation + :collapsable="false" + isPage="true" + :statusoid="statusoid" + ></conversation> </template> <script src="./conversation-page.js"></script> |