Laurent Destailleur ebf68ecbe0 Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: .travis.yml htdocs/contrat/class/contrat.class.php htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php htdocs/core/modules/project/pdf/pdf_baleine.modules.php		2015-12-18 21:03:57 +01:00
..
contrat.class.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-12-18 21:03:57 +01:00
index.html	readd index.html file	2015-02-02 11:13:11 +01:00