aboutsummaryrefslogtreecommitdiffstats
path: root/core/strings.php
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-08-31 15:21:09 +0200
committerLukas Reschke <lukas@owncloud.com>2014-08-31 15:21:09 +0200
commitae3425d2dadbac69e7dcb0ba577db20e63e7d91f (patch)
treef483759739cd951c33ef1c61ade8694f9e1c95e3 /core/strings.php
parent3329e0f2b22207a24ddb4953bbf11964b23682d9 (diff)
parent73685892ed6f255a916512863cd5549914d071e1 (diff)
downloadnextcloud-server-ae3425d2dadbac69e7dcb0ba577db20e63e7d91f.tar.gz
nextcloud-server-ae3425d2dadbac69e7dcb0ba577db20e63e7d91f.zip
Merge branch 'master' into securityutils
Conflicts: lib/private/util.php
Diffstat (limited to 'core/strings.php')
-rw-r--r--core/strings.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/strings.php b/core/strings.php
index 01ab3866089..ebae63bf928 100644
--- a/core/strings.php
+++ b/core/strings.php
@@ -1,7 +1,7 @@
<?php
//some strings that are used in /lib but wont be translatable unless they are in /core too
-$l=OC_L10N::get('core');
+$l = \OC::$server->getL10N('core');
$l->t("Personal");
$l->t("Users");
$l->t("Apps");