Laurent Destailleur 14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: htdocs/admin/stock.php htdocs/admin/system/index.php htdocs/comm/fiche.php htdocs/core/lib/admin.lib.php htdocs/core/lib/holiday.lib.php htdocs/core/lib/pdf.lib.php htdocs/core/login/functions_forceuser.php htdocs/core/login/functions_http.php htdocs/core/menus/standard/auguria.lib.php htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php htdocs/filefunc.inc.php htdocs/holiday/define_holiday.php htdocs/opensurvey/fonctions.php htdocs/societe/canvas/actions_card_common.class.php test/phpunit/CompanyBankAccountTest.php test/phpunit/ExportTest.php test/phpunit/FactureTest.php test/phpunit/FunctionsLibTest.php test/phpunit/PropalTest.php test/phpunit/SocieteTest.php test/phpunit/WebservicesInvoicesTest.php test/phpunit/WebservicesThirdpartyTest.php		2014-09-28 02:14:32 +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
modules_chequereceipts.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
pdf_blochet.class.php	Merge remote-tracking branch 'origin/3.6' into develop	2014-09-28 02:14:32 +02:00