Laurent Destailleur 2a345b6fc0 Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/admin/company.php htdocs/admin/menus/edit.php htdocs/core/class/hookmanager.class.php htdocs/core/class/html.form.class.php htdocs/core/lib/pdf.lib.php		2015-11-21 12:48:41 +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
propal.class.php	Merge remote-tracking branch 'origin/3.8' into develop	2015-11-21 12:48:41 +01:00
propalestats.class.php	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-10-01 11:16:35 +02:00