Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Sep 24, 2025

Continuation of #14658 cherry-pick, targeting 18.0+

Forward-Port-Of: #14660

@robodoo
Copy link
Collaborator

robodoo commented Sep 24, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Sep 24, 2025

@StraubCreative cherrypicking of pull request #14660 failed.

stdout:

Auto-merging content/applications/productivity/voip/didww.rst
CONFLICT (content): Merge conflict in content/applications/productivity/voip/didww.rst

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

closes #14660

Signed-off-by: Zachary Straub (zst) <zst@odoo.com>
@StraubCreative StraubCreative force-pushed the master-18.0-voip-fix-didww-typos-fhe-465487-fw branch from e98bc1c to 16f0b59 Compare September 24, 2025 20:06
@C3POdoo C3POdoo requested a review from a team September 24, 2025 20:07
@StraubCreative StraubCreative self-assigned this Sep 24, 2025
@StraubCreative
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Sep 24, 2025
closes #14660

closes #14674

Signed-off-by: Zachary Straub (zst) <zst@odoo.com>
@robodoo robodoo added the 19.1 label Sep 24, 2025
@robodoo robodoo closed this Sep 24, 2025
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.

5 participants