Laurent Destailleur c4c7ccc226 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/societe/note.php htdocs/societe/rib.php		2016-09-19 14:05:16 +02:00
..
card.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-19 14:05:16 +02:00
index.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00