Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 14:30:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into error-handling

Browse source
This commit is contained in:
Michael 2021-10-31 05:25:39 +00:00
commit 516018861e
235 changed files with 10885 additions and 10716 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Database/Database.php
View file

@ -21,7 +21,7 @@
namespace Friendica\Database;
use Friendica\Core\Config\Cache;
use Friendica\Core\Config\ValueObject\Cache;
use Friendica\Core\System;
use Friendica\Network\HTTPException\ServiceUnavailableException;
use Friendica\Util\DateTimeFormat;
@ -49,7 +49,7 @@ class Database
protected $connected = false;
/**
* @var Cache
* @var \Friendica\Core\Config\ValueObject\Cache
*/
protected $configCache;
/**