From 6185a4b20039d5707270dfd5c0cac5edd2de8b1f Mon Sep 17 00:00:00 2001 From: Marco Colombo Date: Fri, 23 Apr 2021 18:24:00 +0200 Subject: [PATCH] change #1959 to #2234, merge #1942 #1974 #1975 #2077 #2141 --- supermerge.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/supermerge.sh b/supermerge.sh index abe482e3927a..184206e5c31c 100644 --- a/supermerge.sh +++ b/supermerge.sh @@ -20,13 +20,13 @@ git pull --no-ff --no-edit --quiet https://github.com/odoo-italia/l10n-italy 14. # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1931/head # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1938/head # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1939/head -git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1942/head +# merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1942/head # merged # git pull --no-ff --no-edit --quiet https://github.com/fredzamoabg/l10n-italy pull/5/head # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1950/head -git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1959/head +# closed, see #2234 # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1959/head # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1973/head -git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1974/head -git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1975/head +# merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1974/head +# merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1975/head git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1984/head git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1985/head git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2154/head @@ -37,14 +37,14 @@ git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/1990/h git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2043/head git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2044/head # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2079/head -git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2077/head +# merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2077/head git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2080/head git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2128/head # merged # git pull --no-ff --no-edit --quiet https://github.com/TheMule71/l10n-italy 14.0-mig-l10n_it_reverse_charge git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2138/head git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2139/head # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2140/head -git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2141/head +# merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2141/head git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2149/head # merged # as #2210 # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2153/head # merged # git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2156/head @@ -60,3 +60,4 @@ git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2225/h git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2228/head git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2229/head git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2230/head +git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2234/head