Laurent Destailleur 2a3bb96c34 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/core/class/html.form.class.php htdocs/core/lib/ecm.lib.php		2014-12-22 03:14:22 +01:00
..
contact.php	Merge remote-tracking branch 'origin/3.7' into develop	2014-12-22 03:14:22 +01:00
document.php	Fix: Several fixes into tasks and time spent management	2014-12-21 14:58:18 +01:00
index.php	Merge remote-tracking branch 'origin/3.7' into develop	2014-12-04 14:52:34 +01:00
note.php	Fix: Several fixes into tasks and time spent management	2014-12-21 14:58:18 +01:00
task.php	Merge remote-tracking branch 'origin/3.7' into develop	2014-12-22 03:14:22 +01:00
time.php	Fix: Several fixes into tasks and time spent management	2014-12-21 14:58:18 +01:00