fix: socket and saved reply (backport #3000)#3022
Open
mergify[bot] wants to merge 8 commits intomain-hotfixfrom
Open
fix: socket and saved reply (backport #3000)#3022mergify[bot] wants to merge 8 commits intomain-hotfixfrom
mergify[bot] wants to merge 8 commits intomain-hotfixfrom
Conversation
(cherry picked from commit 69e047f) # Conflicts: # desk/src/pages/ticket/TicketCustomer.vue
(cherry picked from commit ea60812)
(cherry picked from commit 29ad7da)
(cherry picked from commit 93bc046)
(cherry picked from commit adb3ee3)
(cherry picked from commit d6d4c4d)
(cherry picked from commit a096e1b)
(cherry picked from commit 60584fc)
Author
|
Cherry-pick of 69e047f has failed: To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
closes: #2684
closes: #3005
This is an automatic backport of pull request #3000 done by Mergify.