Laurent Destailleur e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/admin/tools/eaccelerator.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/dispatch.php		2015-02-19 00:01:26 +01:00
..
class	Merge remote-tracking branch 'origin/3.7' into develop	2015-02-19 00:01:26 +01:00
card.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-02-19 00:01:26 +01:00
index.php	Add PR manually because of conflict "#1678 & #1677 Untranslatable token"	2014-11-22 15:37:18 +01:00
list.php	Update /compta/paiement/cheque/list.php	2014-11-23 17:45:18 +01:00