Merge remote-tracking branch 'origin/3.4' into develop
Conflicts: htdocs/langs/fr_CA/main.lang htdocs/main.inc.php
This commit is contained in:
commit
3395fd6d8d
1 changed files with 0 additions and 2 deletions
|
|
@ -23,5 +23,3 @@ VAT=TPS
|
|||
LT1CA=TVQ
|
||||
VATRate=Taux TPS
|
||||
ErrorNoVATRateDefinedForSellerCountry=Erreur, aucun taux de taxe défini pour le pays '%s'.
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue