From d3db81e45cc18564114ca530deefeca2e081601a Mon Sep 17 00:00:00 2001 From: Marco Colombo Date: Fri, 5 Mar 2021 15:17:58 +0100 Subject: [PATCH] add #2077 #2149 #2151 --- supermerge.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/supermerge.sh b/supermerge.sh index c4fa1d1e4984..3a6f1866e0eb 100644 --- a/supermerge.sh +++ b/supermerge.sh @@ -36,6 +36,7 @@ git pull --no-ff --no-edit --quiet -X theirs https://github.com/OCA/l10n-italy p 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 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 git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2138/head @@ -43,3 +44,5 @@ git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2139/h 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 git pull --no-ff --no-edit --quiet https://github.com/odoo-italia/l10n-italy 14.0-mig-l10n_it_fatturapa_import_zip +git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2149/head +git pull --no-ff --no-edit --quiet https://github.com/OCA/l10n-italy pull/2151/head