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
..
edit.php	Merge remote-tracking branch 'origin/3.8' into develop	2015-11-21 12:48:41 +01:00
index.php	[Qual] Uniformize code	2015-10-23 12:58:30 +02:00
other.php	[Qual] Replaced deprecated print_fiche_titre()	2015-09-24 18:34:58 +02:00