Merge remote-tracking branch 'origin/master' into mergebot/pr1389
# Conflicts: # apps/web/tests/snapshots/sidebar-scrollbar/geometry.expected.md # packages/client/ui-conversation/src/client/chat/MessageIconActions.tsx # packages/client/ui-conversation/src/client/chat/message-chrome.ts
This commit is contained in:
@@ -20,7 +20,7 @@
|
||||
- img
|
||||
- button "Branch into a new conversation":
|
||||
- img
|
||||
- text: {{clock}} Edited queue item {{clock}}
|
||||
- text: {{clock}}Ran for {{duration}} Edited queue item {{clock}}
|
||||
- button "Copy":
|
||||
- img
|
||||
- button "Branch into a new conversation" [disabled]:
|
||||
|
||||
Reference in New Issue
Block a user