diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2013-08-05 14:27:38 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2013-08-05 14:27:38 +0200 |
| commit | af983b843d1335917f4a702cea6d91d28bab68e9 (patch) | |
| tree | 692e6e4090ef282b597b9b69d2abd53262cf47a0 /lib/legacy/config.php | |
| parent | 554b1990e23c76aea182e9b8c2687f8f8b939fb9 (diff) | |
| parent | 0fce89308e2fbcb44a2091ca67f373ba89ee068e (diff) | |
| download | nextcloud-server-af983b843d1335917f4a702cea6d91d28bab68e9.tar.gz nextcloud-server-af983b843d1335917f4a702cea6d91d28bab68e9.zip | |
fix merge conflicts
Diffstat (limited to 'lib/legacy/config.php')
| -rw-r--r-- | lib/legacy/config.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/legacy/config.php b/lib/legacy/config.php index 5294a48ea44..7e498013737 100644 --- a/lib/legacy/config.php +++ b/lib/legacy/config.php @@ -46,6 +46,10 @@ class OC_Config { */ public static $object; + public static function getObject() { + return self::$object; + } + /** * @brief Lists all available config keys * @return array with key names |