Laurent Destailleur 4f4f929efb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/holiday/class/holiday.class.php

2017-11-24 17:02:14 +01:00

..

stats

NEW Add page statistics for project tasks

2017-06-02 19:28:22 +02:00

comment.php

NEW comment system working with all objects

2017-09-18 17:27:29 +02:00

contact.php

Better translation

2017-10-20 04:25:49 +02:00

document.php

Cherry pick

2017-09-17 20:20:27 +02:00

list.php

Use the confirmation when deleting from mass action everywhere.

2017-11-15 11:39:11 +01:00

note.php

Cherry pick

2017-09-17 20:20:27 +02:00

task.php

Work on timesheets

2017-11-22 21:19:40 +01:00

time.php

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-11-24 17:02:14 +01:00