Xavier Morel 65ed7c51bc [IMP] *: note to merge using mergebot in conflict message ... The message has a lot of info, but left the merging bit unwritten. Correct this issue. Fixes #765		2023-08-30 12:10:46 +02:00
..
merge_cron.xml	[IMP] runbot_merge: small reorg of main models file	2021-11-10 13:13:34 +01:00
runbot_merge.pull_requests.feedback.template.csv	[IMP] *: note to merge using mergebot in conflict message	2023-08-30 12:10:46 +02:00