From d03b02a99035f98a8985d10c722b860fdce27d10 Mon Sep 17 00:00:00 2001 From: Marco Colombo Date: Tue, 20 Jul 2021 22:51:05 +0200 Subject: [PATCH] add #2285 #2367 #2369 #2373, merged #2311, disable #2285 (rebase fails) --- supermerge.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/supermerge.sh b/supermerge.sh index 70d9a05d523d..57df2099e012 100644 --- a/supermerge.sh +++ b/supermerge.sh @@ -33,10 +33,10 @@ fi 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 2311 rebase_n_merge_pr 2314 rebase_n_merge_pr 2327 rebase_n_merge_pr 2332 @@ -51,6 +51,9 @@ rebase_n_merge_pr 2355 rebase_n_merge_pr 2358 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 # porting rebase_n_merge_pr 2154 rebase_n_merge_pr 2043