Laurent Destailleur ef5035b349 Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/core/class/commonobject.class.php htdocs/product/liste.php		2014-12-18 11:42:55 +01:00
..
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
project.class.php	Fixed: [ bug #1732 ] Tasks ressources and time consumption are not	2014-12-14 15:09:30 +01:00
task.class.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2014-12-18 11:42:55 +01:00