diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-18 18:31:33 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-18 18:31:33 +0100 |
| commit | c6f4f85e27a10459422ab9789c894d13f0cd34c7 (patch) | |
| tree | 6b4cf7a304242c5891952b428b3bca950924f309 /lib/private/db.php | |
| parent | 9fac95c2ab46a734607657bbad6f164aaa61286f (diff) | |
| parent | 8991e4505adba2dae8afe7b7941ec744bfe78712 (diff) | |
| download | nextcloud-server-c6f4f85e27a10459422ab9789c894d13f0cd34c7.tar.gz nextcloud-server-c6f4f85e27a10459422ab9789c894d13f0cd34c7.zip | |
Merge branch 'master' into scrutinizer_documentation_patches
Conflicts:
lib/private/migration/content.php
Diffstat (limited to 'lib/private/db.php')
| -rw-r--r-- | lib/private/db.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/db.php b/lib/private/db.php index 31132d82c0c..23e9593a579 100644 --- a/lib/private/db.php +++ b/lib/private/db.php @@ -44,7 +44,7 @@ class OC_DB { /** * @var \OC\DB\Connection $connection */ - static private $connection; //the prefered connection to use, only Doctrine + static private $connection; //the preferred connection to use, only Doctrine static private $prefix=null; static private $type=null; |