odoo
[FW][REL] 17.2.10
Contains the following commits:
https://github.com/odoo/o-spreadsheet/commit/2e5e95105 [FIX] chart: deepCopy support object without prototype Task: 3950324
https://github.com/odoo/o-spreadsheet/commit/146b0a0ae [FIX] spreadsheet: fix useSpreadsheetRect Task: 3965147
https://github.com/odoo/o-spreadsheet/commit/1217b1e83 [FIX] composer: Prevent default paste in composer Task: 3864000
https://github.com/odoo/o-spreadsheet/commit/f7df2fd33 [DOC] update integration minimal setup Task: 3918013
Task: 0
Forward-Port-Of: odoo/o-spreadsheet#4392
@pro-odoo cherrypicking of pull request odoo/o-spreadsheet#4392 failed.
stdout:
Auto-merging package-lock.json
CONFLICT (content): Merge conflict in package-lock.json
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
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.
:warning: after resolving this conflict, you will need to merge it via @robodoo.
More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
@pro-odoo this forward port of odoo/o-spreadsheet#4392 is awaiting action (not merged or closed).
@pro-odoo this forward port of odoo/o-spreadsheet#4392 is awaiting action (not merged or closed).
@pro-odoo this forward port of odoo/o-spreadsheet#4392 is awaiting action (not merged or closed).
@pro-odoo this forward port of odoo/o-spreadsheet#4392 is awaiting action (not merged or closed).
@pro-odoo this forward port of odoo/o-spreadsheet#4392 is awaiting action (not merged or closed).
@pro-odoo this forward port of odoo/o-spreadsheet#4392 is awaiting action (not merged or closed).