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
..
doc	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-12-18 21:03:57 +01:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
mod_propale_marbre.php	Doxygen	2014-08-31 23:18:09 +02:00
mod_propale_saphir.php	Fix: Masks works with thirdparty type	2015-03-04 18:18:55 +01:00
modules_propale.php	Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on	2014-09-27 17:13:15 +02:00