Laurent Destailleur 11d1be882c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/contrat/list.php		2014-10-04 17:32:01 +02:00
..
class	Expedition lines from same orderline merged.	2014-10-03 12:20:02 +02:00
stats	Removed closing php tag	2014-05-03 18:18:44 +02:00
tpl	Qual: Renamed all files & links "fiche.php" into "card.php"	2014-09-18 21:18:25 +02:00
card.php	Expedition lines from same orderline merged.	2014-10-03 12:20:02 +02:00
contact.php	Qual: Renamed all files & links "liste.php" into "list.php"	2014-09-18 20:33:37 +02:00
index.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00
list.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00
note.php	Qual: Renamed all files & links "liste.php" into "list.php"	2014-09-18 20:33:37 +02:00
shipment.php	Qual: Renamed all files & links "fiche.php" into "card.php"	2014-09-18 21:18:25 +02:00