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
task	syntax error	2015-10-08 09:34:02 +02: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_project_simple.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00
mod_project_universal.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00
modules_project.php	Created a method generateDocument for several classes	2014-09-16 12:30:37 +02:00