diff options
| author | Shpuld Shpuldson <shpuld@shpposter.club> | 2020-01-13 23:47:32 +0200 |
|---|---|---|
| committer | Shpuld Shpuldson <shpuld@shpposter.club> | 2020-01-13 23:47:32 +0200 |
| commit | b32888194c2b9de286bcfff9998dae009cea224d (patch) | |
| tree | eb907b6457bc6416c9a8661039848aebf8f1727a /src/components/conversation/conversation.vue | |
| parent | 33abbed5a1e1d1cf99d21d481b2a22481d7533b2 (diff) | |
| parent | 7257189ea796d51117285814d32ed6138fdb3458 (diff) | |
fix merge conflicts
Diffstat (limited to 'src/components/conversation/conversation.vue')
| -rw-r--r-- | src/components/conversation/conversation.vue | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 0f1de55f..2e48240a 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -27,6 +27,7 @@ :highlight="getHighlight()" :replies="getReplies(status.id)" :in-profile="inProfile" + :profile-user-id="profileUserId" class="status-fadein panel-body" @goto="setHighlight" @toggleExpanded="toggleExpanded" |