Juanjo Menent c13d2d202b Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: ChangeLog htdocs/filefunc.inc.php		2015-09-08 21:08:59 +02:00
..
class	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-09-08 21:08:59 +02:00
card.php	PHPDoc and misc fixes for several folders	2015-02-10 13:17:37 +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