fix: duplicate end to end encryption info message - WPB-24859 🍒#4746
Closed
github-actions[bot] wants to merge 20 commits into
Closed
fix: duplicate end to end encryption info message - WPB-24859 🍒#4746github-actions[bot] wants to merge 20 commits into
github-actions[bot] wants to merge 20 commits into
Conversation
Co-authored-by: David-Henner <david.henner@wire.com>
…4614) Co-authored-by: Christoph Aldrian <caldrian@users.noreply.github.com> Co-authored-by: John Nguyen <28632506+johnxnguyen@users.noreply.github.com>
…7 🍒 🍒 (#4584) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: François Benaiteau <netbe@users.noreply.github.com> Co-authored-by: Christoph Aldrian <caldrian@users.noreply.github.com>
…ng instance - WPB-24695 (#4653)
…85 (#4680) Co-authored-by: Christoph Aldrian <caldrian@users.noreply.github.com>
zenkins
requested changes
May 20, 2026
Collaborator
zenkins
left a comment
zenkins
left a comment
There was a problem hiding this comment.
❌ Cannot auto-approve: conflict markers (e.g. <<<<<<<, >>>>>>>) were found in the changes. Please resolve them before merging.
|
Collaborator
|
no need to port to develop, this was backported from develop to 4.16 |
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
7 participants
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.
This PR was automatically cherry-picked based on the following PR:
Original PR description:
Issue
This fix is cherry-pick from #4492 and #4697.
Testing
N/A
Checklist
[WPB-XXX].UI accessibility checklist
If your PR includes UI changes, please utilize this checklist: