dolibarr/htdocs/admin/system
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
..
about.php Qual: remove PHP closing tag (again) 2014-05-26 13:51:25 +02:00
browser.php getBrowserInfo can return type of layout (classic/phone/tablet) 2014-07-27 20:56:26 +02:00
constall.php Removed closing php tag 2014-05-03 18:18:44 +02:00
database-tables.php Removed closing php tag 2014-05-03 18:18:44 +02:00
database.php Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on 2014-09-27 17:13:15 +02:00
dbtable.php Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on 2014-09-27 17:13:15 +02:00
dolibarr.php Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on 2014-09-27 17:13:15 +02:00
index.php Merge remote-tracking branch 'origin/3.6' into develop 2014-09-28 02:14:32 +02:00
modules.php Merge pull request #1568 from GPCsolutions/closingtagremoval 2014-05-04 18:08:37 +02:00
os.php Qual: remove PHP closing tag (again) 2014-05-26 13:51:25 +02:00
perf.php Merge remote-tracking branch 'origin/3.5' into develop 2014-05-29 19:20:48 +02:00
phpinfo.php Qual: remove PHP closing tag (again) 2014-05-26 13:51:25 +02:00
web.php Qual: remove PHP closing tag (again) 2014-05-26 13:51:25 +02:00
xcache.php Removed closing php tag 2014-05-03 18:18:44 +02:00
xdebug.php Removed closing php tag 2014-05-03 18:18:44 +02:00