merged OCA#2337 OCA#2354 OCA#2364, fixes OCA#2327 OCA#2332 OCA#2344 O…

…CA#2355 OCA#2358 OCA#2360 OCA#2364
odoo-italia · Oct 1, 2021 · eec3877 · eec3877
1 parent 68a77f6
commit eec3877
Showing 1 changed file with 7 additions and 3 deletions.
diff --git 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