Skip to content

[FW][IMP] website: add header and footer, improve menu page #13381

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

Closed
wants to merge 1 commit into from

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented May 15, 2025

taskid-4644988

Forward-Port-Of: #12925

@robodoo
Copy link
Collaborator

robodoo commented May 15, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented May 15, 2025

@chiaraprattico @auva-odoo cherrypicking of pull request #12925 failed.

stdout:

CONFLICT (modify/delete): content/applications/sales/members.rst deleted in d20bade8c4bec86c64a37b65cdde471874881b4a and modified in 0e55320cace1acf0ec30d3056adc593956b57e57.  Version 0e55320cace1acf0ec30d3056adc593956b57e57 of content/applications/sales/members.rst left in tree.
Auto-merging redirects/18.0.txt

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

@auva-odoo auva-odoo force-pushed the saas-18.3-18.0-headers-chpr-436399-fw branch from 03b7ab4 to 36fd0a2 Compare May 16, 2025 06:32
@C3POdoo C3POdoo requested a review from a team May 16, 2025 06:34
@auva-odoo
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request May 16, 2025
taskid-4644988

closes #13381

Signed-off-by: Audrey Vandromme (auva) <[email protected]>
robodoo pushed a commit that referenced this pull request May 16, 2025
taskid-4644988

closes #13381

Signed-off-by: Audrey Vandromme (auva) <[email protected]>
@robodoo robodoo closed this May 16, 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.

4 participants