Laurent Destailleur fbc0b5b313 Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: htdocs/contact/vcard.php htdocs/societe/consumption.php		2015-07-19 11:38:44 +02:00
..
bonprelevement.class.php	Fix phpcs	2015-03-01 13:52:58 +01:00
ligneprelevement.class.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
rejetprelevement.class.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2015-07-19 11:38:44 +02:00