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

chore: erpnext.com -> frappe.io/erpnext (backport #46288) #46289

Merged
merged 3 commits into from
Mar 5, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 5, 2025


This is an automatic backport of pull request #46288 done by [Mergify](https://mergify.com).

(cherry picked from commit 41fe30e)

# Conflicts:
#	README.md
#	pyproject.toml
@mergify mergify bot requested a review from akhilnarang as a code owner March 5, 2025 05:33
@mergify mergify bot added the conflicts label Mar 5, 2025
@mergify mergify bot assigned ankush Mar 5, 2025
Copy link
Contributor Author

mergify bot commented Mar 5, 2025

Cherry-pick of 41fe30e has failed:

On branch mergify/bp/version-14-hotfix/pr-46288
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit 41fe30ea6e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/hooks.py
	modified:   erpnext/setup/install.py
	modified:   erpnext/templates/includes/footer/footer_powered.html
	modified:   package.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   README.md
	both modified:   pyproject.toml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Mar 5, 2025
@ankush ankush merged commit fbf6d8c into version-14-hotfix Mar 5, 2025
9 of 10 checks passed
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-46288 branch March 5, 2025 06:07
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.83.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants