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.

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

feat: add local holidays (backport #36116) #36134

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 14, 2023

This is an automatic backport of pull request #36116 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit aa18b25)
(cherry picked from commit 509061f)

# Conflicts:
#	erpnext/translations/de.csv
For consistency with "weekly off" descriptions

(cherry picked from commit 8271a39)
@mergify mergify bot requested a review from ankush as a code owner July 14, 2023 12:16
@mergify mergify bot added the conflicts label Jul 14, 2023
@barredterra barredterra removed their assignment Jul 14, 2023
@deepeshgarg007 deepeshgarg007 merged commit 94caf7f into version-14-hotfix Jul 14, 2023
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-36116 branch July 14, 2023 15:08
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.31.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants