diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-01-30 19:24:24 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-01-30 19:24:24 +0100 |
| commit | 207aa22d12931d161f682198996086e74c91bf53 (patch) | |
| tree | 26f65a42462244fdfc14e15c7788da8b7f8a524e /lib/base.php | |
| parent | 95352fbc1568e0c49be25461a07d53b3d5ad3b45 (diff) | |
| parent | 2fbf3d40900d29c04b69f0c18e4d833a312fb21c (diff) | |
| download | nextcloud-server-207aa22d12931d161f682198996086e74c91bf53.tar.gz nextcloud-server-207aa22d12931d161f682198996086e74c91bf53.zip | |
merge master into filesystem
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index c1fece0c3d9..ea5c939cd80 100644 --- a/lib/base.php +++ b/lib/base.php @@ -504,7 +504,7 @@ class OC // write error into log if locale can't be set if (OC_Util::issetlocaleworking() == false) { - OC_Log::write('core', 'setting locate to en_US.UTF-8 failed. Support is probably not installed on your system', OC_Log::ERROR); + OC_Log::write('core', 'setting locale to en_US.UTF-8 failed. Support is probably not installed on your system', OC_Log::ERROR); } if (OC_Config::getValue('installed', false)) { if (OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') { |