Laurent Destailleur 7b7d27920d Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/adherents/type.php htdocs/categories/class/categorie.class.php htdocs/core/class/commonobject.class.php htdocs/core/class/extrafields.class.php htdocs/core/lib/tax.lib.php htdocs/product/composition/card.php		2015-10-10 18:56:28 +02:00
..
class	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-10-01 11:16:35 +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-10-10 18:56:28 +02:00
document.php	Qual: deprecate dol_json_encode() and dol_json_decode()	2015-06-01 11:00:11 +02:00
index.php	FIX Event from ical stream should not be movable into calendar view	2015-09-26 13:54:50 +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: transparency of event was lost	2015-08-14 13:01:20 +02:00