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 #36329 to staging 🍒 #36330

Merged
merged 3 commits into from
Feb 12, 2024
Merged

🍒 Cherry pick PR #36329 to staging 🍒 #36330

merged 3 commits into from
Feb 12, 2024
+9 −10

Conversation

os-botify[bot]
Copy link

@os-botify os-botify bot commented Feb 12, 2024

🍒 Cherry pick #36329 to staging 🍒

OSBotify and others added 2 commits February 12, 2024 13:10
@OSBotify
Update version to 1.4.39-8
90b0174 
(cherry picked from commit 33ef52d)
@Beamanator @OSBotify
Merge pull request #36329 from Expensify/beaman-add-navigation-fix-back
4638aa6 
Add nav backup back so we can CP to staging

(cherry picked from commit 4c98589)
@os-botify os-botify bot requested a review from a team as a code owner February 12, 2024 13:10
@os-botify
Copy link
Author

os-botify bot commented Feb 12, 2024

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 removed the request for review from a team February 12, 2024 13:10
@melvin-bot Melvin Bot
Copy link

melvin-bot bot commented Feb 12, 2024

@tgolen 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]

@melvin-bot melvin-bot bot requested a review from tgolen February 12, 2024 13:10
@Beamanator Beamanator merged commit ff03e25 into staging Feb 12, 2024
4 of 6 checks passed
@Beamanator Beamanator deleted the Beamanator-cherry-pick-staging-36329-1 branch February 12, 2024 13:14
@amyevans amyevans mentioned this pull request Feb 14, 2024
Closed
56 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mountiny mountiny mountiny approved these changes

@tgolen tgolen Awaiting requested review from tgolen

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
@mountiny @Beamanator @OSBotify