Laurent Destailleur 04664c203d Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/comm/action/card.php htdocs/expedition/class/expedition.class.php htdocs/product/stock/product.php		2015-11-05 22:13:08 +01:00
..
class	Merge pull request #3682 from tysauron/develop	2015-10-09 20:25:39 +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 develop	2015-11-05 22:13:08 +01:00
document.php	Qual: deprecate dol_json_encode() and dol_json_decode()	2015-06-01 11:00:11 +02:00
index.php	Fix css	2015-10-02 11:58:19 +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.8' into develop	2015-11-02 19:31:42 +01:00
peruser.php	[Qual] Replaced deprecated print_fiche_titre()	2015-09-24 18:34:58 +02:00