From 8e2131dbf91a2983a6c93d1a42f42758f0aa9a7a Mon Sep 17 00:00:00 2001 From: Marco Colombo Date: Fri, 1 Oct 2021 23:52:42 +0200 Subject: [PATCH] merged #2043 2080# #2303 #2305 #2358 #2419 #2427, added #2432 #2442 #2446, norebase #2360 --- supermerge.sh | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/supermerge.sh b/supermerge.sh index 634209e6eb1b..a76b0c210f6c 100644 --- a/supermerge.sh +++ b/supermerge.sh @@ -34,29 +34,25 @@ set -xe rebase_n_merge https://github.com/odoo-italia/l10n-italy 14.0-premerge 14.0-premerge # fixes # rebase_n_merge_pr 2285 -rebase_n_merge_pr 2303 -rebase_n_merge_pr 2305 rebase_n_merge_pr 2309 rebase_n_merge_pr 2327 rebase_n_merge_pr 2335 rebase_n_merge_pr 2338 rebase_n_merge_pr 2344 rebase_n_merge_pr 2346 -rebase_n_merge_pr 2358 -rebase_n_merge_pr 2360 +#rebase_n_merge_pr 2360 rebase_n_merge_pr 2364 rebase_n_merge_pr 2367 rebase_n_merge_pr 2369 rebase_n_merge_pr 2373 rebase_n_merge_pr 2388 rebase_n_merge_pr 2392 -rebase_n_merge_pr 2419 rebase_n_merge_pr 2425 -rebase_n_merge_pr 2427 rebase_n_merge_pr 2430 +rebase_n_merge_pr 2432 +rebase_n_merge_pr 2442 +rebase_n_merge_pr 2446 # porting -rebase_n_merge_pr 2043 -rebase_n_merge_pr 2080 rebase_n_merge_pr 2310 rebase_n_merge_pr 2138 rebase_n_merge_pr 2139 @@ -75,3 +71,4 @@ rebase_n_merge_pr 2259 rebase_n_merge_pr 2315 rebase_n_merge https://github.com/OmniaGit/l10n-italy 14.0-mig-l10n_it_location_nuts 14.0-mig-l10n_it_location_nuts rebase_n_merge_pr 2386 +#rebase_n_merge_pr 2438