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 #28433 to staging 🍒 #28447

Merged
merged 3 commits into from
Sep 29, 2023
Merged

🍒 Cherry pick PR #28433 to staging 🍒 #28447

merged 3 commits into from
Sep 29, 2023

Conversation

OSBotify
Copy link
Contributor

🍒 Cherry pick #28433 to staging 🍒

OSBotify and others added 2 commits September 29, 2023 08:28
@OSBotify
Update version to 1.3.75-1
11c8154 
(cherry picked from commit 4208f74)
@luacmartins @OSBotify
Merge pull request #28433 from Expensify/cole_wallet_terms
e835544 
Add conditional wallet terms based on program ID

(cherry picked from commit bcc8a63)
@OSBotify OSBotify requested a review from a team as a code owner September 29, 2023 08:28
@melvin-bot melvin-bot bot removed the request for review from a team September 29, 2023 08:28
@OSBotify
Copy link
Contributor Author

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.

@mountiny mountiny self-assigned this Sep 29, 2023
techievivek
techievivek approved these changes Sep 29, 2023
View reviewed changes
Copy link
Contributor

@techievivek techievivek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@techievivek techievivek merged commit 02f3d66 into staging Sep 29, 2023
@techievivek techievivek deleted the thienlnam-cherry-pick-staging-28433-1 branch September 29, 2023 09:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@techievivek techievivek techievivek approved these changes

Assignees

@thienlnam thienlnam

@mountiny mountiny

Labels
Engineering Hourly KSv2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@OSBotify @techievivek @thienlnam @mountiny @luacmartins