From 363028b34b9f23fc3c78143dad3d9db89225a037 Mon Sep 17 00:00:00 2001 From: Marco Colombo Date: Fri, 18 Jun 2021 16:52:04 +0200 Subject: [PATCH] merged #1989 #1990 #2128 - added #2303 #2305 #2309 #2311 #2314 #2335 #2336 #2310 PR #2151 under investigation --- supermerge.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/supermerge.sh b/supermerge.sh index 5a3d4d1df471..83cc7454657d 100644 --- a/supermerge.sh +++ b/supermerge.sh @@ -32,16 +32,23 @@ fi set -xe rebase_n_merge https://github.com/odoo-italia/l10n-italy 14.0-premerge 14.0-premerge +# fixes +rebase_n_merge_pr 2303 +rebase_n_merge_pr 2305 +rebase_n_merge_pr 2309 +rebase_n_merge_pr 2311 +rebase_n_merge_pr 2314 +rebase_n_merge_pr 2335 +rebase_n_merge_pr 2336 +# porting rebase_n_merge_pr 2154 -rebase_n_merge_pr 1989 -rebase_n_merge_pr 1990 rebase_n_merge_pr 2043 rebase_n_merge_pr 2080 -rebase_n_merge_pr 2128 +rebase_n_merge_pr 2310 rebase_n_merge_pr 2138 rebase_n_merge_pr 2139 rebase_n_merge_pr 2149 -rebase_n_merge_pr 2151 +#?rebase_n_merge_pr 2151 rebase_n_merge_pr 2157 rebase_n_merge_pr 2198 rebase_n_merge_pr 2202