Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🍒 Cherry pick PR #24091 to staging 🍒 #24166

Merged
merged 3 commits into from
Aug 4, 2023
Merged

🍒 Cherry pick PR #24091 to staging 🍒 #24166

merged 3 commits into from
Aug 4, 2023

Conversation

OSBotify
Copy link
Contributor

@OSBotify OSBotify commented Aug 4, 2023

🍒 Cherry pick #24091 to staging 🍒

OSBotify and others added 2 commits August 4, 2023 15:38
@OSBotify
Update version to 1.3.50-2
5ac39a1 
(cherry picked from commit 96df822)
@Beamanator @OSBotify
Merge pull request #24091 from dukenv0307/fix/22691-regression
7a7b1c1 
[CP Staging] Fix user cannot open detail page of chat room

(cherry picked from commit a67e8af)
@OSBotify OSBotify requested a review from a team as a code owner August 4, 2023 15:38
@melvin-bot melvin-bot bot removed the request for review from a team August 4, 2023 15:38
@OSBotify
Copy link
Contributor Author

OSBotify commented Aug 4, 2023

This pull request has merge conflicts and can not be automatically merged. 😞
Please manually resolve the conflicts, push your changes, and then request another reviewer to review and merge.
Important: There may be conflicts that GitHub is not able to detect, so please carefully review this pull request before approving.

@melvin-bot melvin-bot bot requested a review from thienlnam August 4, 2023 15:39
@melvin-bot
Copy link

melvin-bot bot commented Aug 4, 2023

@thienlnam Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@Beamanator
Copy link
Contributor

Conflict came from: #24019

@puneetlath puneetlath merged commit 1105768 into staging Aug 4, 2023
1 of 2 checks passed
@puneetlath puneetlath deleted the Beamanator-cherry-pick-staging-24091-1 branch August 4, 2023 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@puneetlath puneetlath puneetlath approved these changes

@thienlnam thienlnam Awaiting requested review from thienlnam

Assignees

@Beamanator Beamanator

Labels
Engineering Hourly KSv2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@OSBotify @Beamanator @puneetlath