Laurent Destailleur ff8969073c Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/contrat/class/contrat.class.php htdocs/core/class/extrafields.class.php htdocs/main.inc.php		2015-07-28 18:57:13 +02:00
..
class	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-07-28 18:57:13 +02:00
rapport	Fix: Miscellaneous fixes for multicompany	2014-12-06 14:41:56 +01:00
card.php	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-07-28 18:57:13 +02:00
document.php	Qual: deprecate dol_json_encode() and dol_json_decode()	2015-06-01 11:00:11 +02:00
index.php	Fix timezone problem with external calendar import.	2015-07-28 18:12:45 +02:00
info.php	Fix: [ bug #1374 ] Salaries module requires "Special costs" module to	2014-05-10 18:57:04 +02:00
listactions.php	Fix: The hook addCalendarChoice was only visible into tabs index.php	2015-07-21 12:19:21 +02:00
peruser.php	Fix: css on current day	2015-07-21 12:30:12 +02:00