Laurent Destailleur dd3f5a32d3 Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: .travis.yml composer.json htdocs/accountancy/admin/card.php		2015-12-18 21:20:12 +01:00
..
contrat.class.php	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-12-18 21:20:12 +01:00
index.html	readd index.html file	2015-02-02 11:13:11 +01:00