Skip to content

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Sep 13, 2024

task-3709518

16.0: Keep Icons section from existing version

Forward-Port-Of: #11004
Forward-Port-Of: #10675

@robodoo
Copy link
Collaborator

robodoo commented Sep 13, 2024

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Sep 13, 2024

This PR targets 17.0 and is part of the forward-port chain. Further PRs will be created up to master.

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

@auva-odoo auva-odoo force-pushed the 17.0-15.0-doc-guidelines-auva-IyCK-fw branch from 284e77c to 96c72ca Compare September 16, 2024 06:55
@fw-bot
Copy link
Collaborator Author

fw-bot commented Sep 16, 2024

@auva-odoo this PR was modified / updated and has become a normal PR. It must be merged directly.

@fw-bot
Copy link
Collaborator Author

fw-bot commented Sep 16, 2024

@auva-odoo WARNING: the latest change (96c72ca) triggered a conflict when updating the next forward-port (#11021), and has been ignored.

You will need to update this pull request differently, or fix the issue by hand on #11021.

@fw-bot
Copy link
Collaborator Author

fw-bot commented Sep 16, 2024

@auva-odoo child PR #11021 was modified / updated and has become a normal PR. This PR (and any of its parents) will need to be merged independently as approvals won't cross.

@auva-odoo
Copy link
Contributor

@robodoo r+

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.

3 participants