diff options
| author | Sean King <seanking2919@protonmail.com> | 2022-08-07 06:38:56 +0000 |
|---|---|---|
| committer | Sean King <seanking2919@protonmail.com> | 2022-08-07 06:38:56 +0000 |
| commit | 572f28d7c9efea4300cb88063baf4daab91e7910 (patch) | |
| tree | 29d966a1b7141f6a768120497d3f34143f467212 /src/components/conversation | |
| parent | 18d69f93d38dc15a74db81ee4c10b4766bebfc35 (diff) | |
| parent | 6a2f4270727913b8e5d4670b5b3bbc3f57f51ec5 (diff) | |
Merge branch 'fix/merge-conflicts/report-notifications' into 'feat/report-notification'
Fixing merge conflicts and lint for report notifications MR
See merge request pleroma/pleroma-fe!1585
Diffstat (limited to 'src/components/conversation')
| -rw-r--r-- | src/components/conversation/conversation.js | 2 | ||||
| -rw-r--r-- | src/components/conversation/conversation.vue | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index 2ef2977a..3b540cac 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -271,7 +271,7 @@ const conversation = { result[irid] = result[irid] || [] result[irid].push({ name: `#${i}`, - id: id + id }) } i++ diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 6088e1ca..1adbe250 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -31,8 +31,8 @@ keypath="status.show_all_conversation_with_icon" tag="button" class="button-unstyled -link" - @click.prevent="diveToTopLevel" scope="global" + @click.prevent="diveToTopLevel" > <template #icon> <FAIcon |