From eec387707a8bc6b4d3233f1bf8d4f880fb982c6a Mon Sep 17 00:00:00 2001 From: Marco Colombo Date: Sat, 17 Jul 2021 16:07:48 +0200 Subject: [PATCH] merged #2337 #2354 #2364, fixes #2327 #2332 #2344 #2355 #2358 #2360 #2364 --- supermerge.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/supermerge.sh b/supermerge.sh index 834970e25301..70d9a05d523d 100644 --- a/supermerge.sh +++ b/supermerge.sh @@ -38,13 +38,19 @@ 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 rebase_n_merge_pr 2335 rebase_n_merge_pr 2336 rebase_n_merge_pr 2338 +rebase_n_merge_pr 2344 rebase_n_merge_pr 2346 rebase_n_merge_pr 2352 rebase_n_merge_pr 2353 -rebase_n_merge_pr 2354 +rebase_n_merge_pr 2355 +rebase_n_merge_pr 2358 +rebase_n_merge_pr 2360 +rebase_n_merge_pr 2364 # porting rebase_n_merge_pr 2154 rebase_n_merge_pr 2043 @@ -53,7 +59,6 @@ rebase_n_merge_pr 2310 -X theirs rebase_n_merge_pr 2138 rebase_n_merge_pr 2139 rebase_n_merge_pr 2149 -rebase_n_merge_pr 2364 rebase_n_merge_pr 2157 rebase_n_merge_pr 2198 rebase_n_merge_pr 2202 @@ -65,5 +70,4 @@ rebase_n_merge_pr 2238 rebase_n_merge_pr 2258 rebase_n_merge_pr 2259 rebase_n_merge_pr 2315 -rebase_n_merge_pr 2337 rebase_n_merge https://github.com/OmniaGit/l10n-italy 14.0-mig-l10n_it_location_nuts 14.0-mig-l10n_it_location_nuts