Laurent Destailleur 687e3d250b Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: dev/fixdosfiles.sh htdocs/core/tpl/objectline_edit.tpl.php		2015-03-13 17:46:31 +01:00
..
card.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-03-13 17:46:31 +01:00
index.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00