Laurent Destailleur e29f533b7a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/comm/propal/class/propal.class.php		2013-04-27 15:15:31 +02:00
..
commande.class.php	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2013-04-27 15:15:31 +02:00
commandestats.class.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00