Laurent Destailleur 9ba1ca5acb Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14 ... Conflicts: htdocs/langs/en_US/companies.lang		2016-07-15 17:05:12 +02:00
..
card.php	Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14	2016-07-15 17:05:12 +02:00
index.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00