Laurent Destailleur 52c82508e4 Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/compta/charges/index.php		2016-02-18 23:27:57 +01:00
..
index.php	Merge remote-tracking branch 'origin/3.8' into 3.9	2016-02-18 23:27:57 +01:00