diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-25 09:52:12 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-25 09:52:12 +0200 |
| commit | db39fede97dc4d6b9a5caf739cb2c03b4dbdd21d (patch) | |
| tree | 0d8c9f25deb067ce23e901c72f2af842e9002341 /lib/base.php | |
| parent | 843f15f3489856b518a30de4c803740844232209 (diff) | |
| parent | 2d12e52769a30ba37d5760b1194f613bcc71035b (diff) | |
| download | nextcloud-server-db39fede97dc4d6b9a5caf739cb2c03b4dbdd21d.tar.gz nextcloud-server-db39fede97dc4d6b9a5caf739cb2c03b4dbdd21d.zip | |
Merge branch 'master' into appframework-master
Conflicts:
apps/files/lib/helper.php
apps/files_trashbin/lib/helper.php
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/base.php b/lib/base.php index 0650361be91..58894be03ee 100644 --- a/lib/base.php +++ b/lib/base.php @@ -371,6 +371,7 @@ class OC { self::$loader->registerPrefix('Doctrine\\Common', 'doctrine/common/lib'); self::$loader->registerPrefix('Doctrine\\DBAL', 'doctrine/dbal/lib'); self::$loader->registerPrefix('Symfony\\Component\\Routing', 'symfony/routing'); + self::$loader->registerPrefix('Symfony\\Component\\Console', 'symfony/console'); self::$loader->registerPrefix('Sabre\\VObject', '3rdparty'); self::$loader->registerPrefix('Sabre_', '3rdparty'); self::$loader->registerPrefix('Patchwork', '3rdparty'); |