Laurent Destailleur df9a6dae6c Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php htdocs/core/tpl/objectline_create.tpl.php htdocs/fichinter/fiche.php		2014-11-28 02:20:01 +01:00
..
doc	Merge remote-tracking branch 'origin/3.6' into 3.7	2014-11-28 02:20:01 +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	Doxygen	2014-08-31 23:06:58 +02:00
modules_propale.php	Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on	2014-09-27 17:13:15 +02:00