lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/core/class/CMailFile.class.php
This commit is contained in:
Laurent Destailleur 2020-02-06 13:05:52 +01:00
commit c8f7b79c48
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/db/DoliDB.class.php
View File

@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT .'/core/db/Database.interface.php';
*/ */
abstract class DoliDB implements Database abstract class DoliDB implements Database
{ {
/** @var bool|resource Database handler */ /** @var bool|resource|SQLite3 Database handler */
public $db; public $db;
/** @var string Database type */ /** @var string Database type */
public $type; public $type;