dolibarr/htdocs/core/db
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
..
Database.interface.php Corrected Database.interface doc 2014-05-03 13:27:24 +02:00
DoliDB.class.php Merge remote-tracking branch 'origin/3.6' into develop 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
mssql.class.php Avoid duplicate logs 2014-08-15 19:29:19 +02:00
mysql.class.php Merge remote-tracking branch 'origin/3.6' into develop 2014-08-17 19:34:12 +02:00
mysqli.class.php Merge remote-tracking branch 'origin/3.6' into develop 2014-08-17 19:34:12 +02:00
pgsql.class.php Fix: Option to make pg_dump/restore 2014-09-17 17:38:07 +02:00
sqlite.class.php Removed 2 other call to getStaticMember (pb with php 5.5).Fix PHPCS for 2014-08-01 00:53:29 +02:00