Skip to content

🍒 Cherry pick PR #17348 to staging 🍒#18999

Closed
OSBotify wants to merge 2 commits into
stagingfrom
OSBotify-cherry-pick-staging-17348
Closed

🍒 Cherry pick PR #17348 to staging 🍒#18999
OSBotify wants to merge 2 commits into
stagingfrom
OSBotify-cherry-pick-staging-17348

Conversation

@OSBotify

Copy link
Copy Markdown
Contributor

🍒 Cherry pick #17348 to staging 🍒

OSBotify and others added 2 commits May 16, 2023 10:00
…42C3-A9B0-4862AD99A2FE

Update version to 1.3.14-7 on main

(cherry picked from commit a2c613b)
Allow money request deletion

(cherry picked from commit 3119b61)
@OSBotify OSBotify requested a review from a team as a code owner May 16, 2023 10:00
@melvin-bot melvin-bot Bot removed the request for review from a team May 16, 2023 10:00
@OSBotify

Copy link
Copy Markdown
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

Copy link
Copy Markdown
Contributor

Ok this is hard to resolve because we there was another PR for tasks merged too and I dont want to mess this up so lets wait for next deploy. The TaskAction does not exist on staging yet

@mountiny mountiny closed this May 16, 2023
@coleaeason coleaeason deleted the OSBotify-cherry-pick-staging-17348 branch May 19, 2026 19:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants