Laurent Destailleur 5b29c87933 Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/compta/deplacement/fiche.php htdocs/core/tpl/objectline_create.tpl.php htdocs/expedition/fiche.php		2015-04-19 00:23:46 +02:00
..
class
stats
card.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-04-19 00:23:46 +02:00
document.php
index.php
info.php
list.php