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

fix: notification message highlight (backport #26776) #26820

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 21, 2024

Please provide enough information so that others can review your pull request:

Explain the details for making this change. What existing problem does the pull request solve?

Screenshots/GIFs


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

(cherry picked from commit b7a7e5a)

# Conflicts:
#	frappe/email/doctype/notification/notification.json
@mergify mergify bot added the conflicts label Jun 21, 2024
Copy link
Contributor Author

mergify bot commented Jun 21, 2024

Cherry-pick of b7a7e5a has failed:

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

You are currently cherry-picking commit b7a7e5a316.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/email/doctype/notification/notification.json

no changes added to commit (use "git add" and/or "git commit -a")

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

@surajshetty3416 surajshetty3416 merged commit 1af8f43 into version-15-hotfix Jun 21, 2024
17 of 18 checks passed
@surajshetty3416 surajshetty3416 deleted the mergify/bp/version-15-hotfix/pr-26776 branch June 21, 2024 11:49
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.32.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 Jul 10, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants