Juanjo Menent 05b0a9b675 Merge remote-tracking branch 'origin/3.7' into 3.8 ... # Conflicts: # htdocs/core/menus/standard/eldy.lib.php		2015-08-01 14:50:07 +02: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	Merge remote-tracking branch 'origin/3.7' into develop	2015-07-21 00:17:11 +02:00
projectstats.class.php	Bad stat report	2015-07-10 10:42:42 +02:00
task.class.php	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-08-01 14:50:07 +02:00