lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.4' into develop

Browse Source 
Conflicts:
	htdocs/langs/fr_CA/main.lang
	htdocs/main.inc.php
This commit is contained in:
Laurent Destailleur 2013-06-01 00:04:51 +02:00
commit 3395fd6d8d
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/fr_CA/main.lang
View File

@ -23,5 +23,3 @@ VAT=TPS
LT1CA=TVQ
VATRate=Taux TPS
ErrorNoVATRateDefinedForSellerCountry=Erreur, aucun taux de taxe défini pour le pays '%s'.