From 3f7d73a7c89bc80562ec1c1bdbabcd8197d39402 Mon Sep 17 00:00:00 2001 From: Marco Colombo Date: Mon, 24 May 2021 11:15:07 +0200 Subject: [PATCH] merged #2205, #2246; new #2278 --- supermerge.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/supermerge.sh b/supermerge.sh index 8c0c7e9e3f31..0c695ba90b08 100644 --- a/supermerge.sh +++ b/supermerge.sh @@ -55,7 +55,7 @@ git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2198/h # closed, see #2230 # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2199/head git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2202/head git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2203/head -git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2205/head +# merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2205/head git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2212/head # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2220/head # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2225/head @@ -64,11 +64,12 @@ git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2229/h # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2230/head # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2234/head git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2238/head -git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2246/head +# merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2246/head git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2248/head #git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2258/head # closed, see #2258 # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2166/head git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2166/head git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2259/head +git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2278/head git pull --no-ff --no-edit --quiet https://github.com/OmniaGit/l10n-italy 14.0-mig-l10n_it_location_nuts