Laurent Destailleur 3395fd6d8d Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: htdocs/langs/fr_CA/main.lang htdocs/main.inc.php		2013-06-01 00:04:51 +02:00
..
admin.lang	Fix: function to get localtax1 or 2 value from vat rate return bad value	2013-05-31 21:33:48 +02:00
companies.lang	Fix: function to get localtax1 or 2 value from vat rate return bad value	2013-05-31 21:33:48 +02:00
main.lang	Merge remote-tracking branch 'origin/3.4' into develop	2013-06-01 00:04:51 +02:00