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 #6951 to staging 🍒 #6956

Closed
wants to merge 3 commits into from
Closed

🍒 Cherry pick PR #6951 to staging 🍒 #6956

wants to merge 3 commits into from

Conversation

OSBotify
Copy link
Contributor

🍒 Cherry pick #6951 to staging 🍒

OSBotify and others added 2 commits December 30, 2021 17:02
@OSBotify
Merge pull request #6955 from Expensify/version-BUILD-e78742336773b60…
700239c 
…081dd1a74705d2975690ea5c4

(cherry picked from commit 6159a70)
@aldo-expensify @OSBotify
Merge pull request #6951 from parasharrajat/room-page
147e242 
fix: room page layout
(cherry picked from commit e787423)
@OSBotify OSBotify requested a review from a team as a code owner December 30, 2021 17:02
@MelvinBot MelvinBot removed the request for review from a team December 30, 2021 17:02
@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.

@roryabraham roryabraham deleted the OSBotify-cherry-pick-staging-6951 branch January 5, 2022 21:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TomatoToaster TomatoToaster Awaiting requested review from TomatoToaster

Assignees

@aldo-expensify aldo-expensify

Labels
automerge Engineering Hourly KSv2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@OSBotify @AndrewGable @aldo-expensify