diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-08-11 17:42:37 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-08-11 17:42:37 -0400 |
| commit | 4830555cce8fbc5505b4d6bbc2bdd5ddc582f3b5 (patch) | |
| tree | 1d6c150ca0c725abb854afc2ab76422ebdcd4d85 /lib/util.php | |
| parent | 9e35d5a886b192b1ab3e19ca0e1b9608a39d60ac (diff) | |
| parent | 52df7accfd1a1a8f4ac35d29e00d60961469c063 (diff) | |
| download | nextcloud-server-4830555cce8fbc5505b4d6bbc2bdd5ddc582f3b5.tar.gz nextcloud-server-4830555cce8fbc5505b4d6bbc2bdd5ddc582f3b5.zip | |
Merge branch 'master' into sharing
Conflicts:
.gitignore
Diffstat (limited to 'lib/util.php')
| -rw-r--r-- | lib/util.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php index 10cd320977a..224b54335b8 100644 --- a/lib/util.php +++ b/lib/util.php @@ -194,7 +194,7 @@ class OC_Util { global $SERVERROOT; global $CONFIG_DATADIRECTORY; - $CONFIG_DATADIRECTORY_ROOT = OC_Config::getValue( "datadirectory", "$SERVERROOT/data" );; + $CONFIG_DATADIRECTORY_ROOT = OC_Config::getValue( "datadirectory", "$SERVERROOT/data" ); $CONFIG_BACKUPDIRECTORY = OC_Config::getValue( "backupdirectory", "$SERVERROOT/backup" ); $CONFIG_INSTALLED = OC_Config::getValue( "installed", false ); $errors=array(); |