Laurent Destailleur 0cefe5af43 Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: htdocs/comm/action/listactions.php htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/core/lib/date.lib.php htdocs/fourn/facture/fiche.php htdocs/includes/tcpdf/include/tcpdf_static.php htdocs/product/price.php		2014-09-07 13:18:56 +02:00
..
class	Merge	2014-09-07 12:22:04 +02:00
rapport	Deprecating arbitrary use of dol_htmloutput* functions	2014-07-20 02:32:13 +02:00
contact.php	Deprecating arbitrary use of dol_htmloutput* functions	2014-07-20 02:32:13 +02:00
document.php	Fix: [ bug #1374 ] Salaries module requires "Special costs" module to	2014-05-10 18:57:04 +02:00
fiche.php	fix travis failure	2014-08-08 15:00:03 +02:00
index.php	Work on agenda per user.	2014-09-05 21:12:01 +02:00
info.php	Fix: [ bug #1374 ] Salaries module requires "Special costs" module to	2014-05-10 18:57:04 +02:00
listactions.php	Merge remote-tracking branch 'origin/3.6' into develop	2014-09-07 13:18:56 +02:00
peruser.php	Search on a specific day is possible into per user view.	2014-09-06 17:55:33 +02:00