diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-08-31 15:21:09 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-08-31 15:21:09 +0200 |
| commit | ae3425d2dadbac69e7dcb0ba577db20e63e7d91f (patch) | |
| tree | f483759739cd951c33ef1c61ade8694f9e1c95e3 /lib/public/util.php | |
| parent | 3329e0f2b22207a24ddb4953bbf11964b23682d9 (diff) | |
| parent | 73685892ed6f255a916512863cd5549914d071e1 (diff) | |
| download | nextcloud-server-ae3425d2dadbac69e7dcb0ba577db20e63e7d91f.tar.gz nextcloud-server-ae3425d2dadbac69e7dcb0ba577db20e63e7d91f.zip | |
Merge branch 'master' into securityutils
Conflicts:
lib/private/util.php
Diffstat (limited to 'lib/public/util.php')
| -rw-r--r-- | lib/public/util.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/public/util.php b/lib/public/util.php index 83a6155685b..2f657facfe8 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -132,7 +132,7 @@ class Util { * @return \OC_L10N */ public static function getL10N($application, $language = null) { - return \OC_L10N::get($application, $language); + return \OC::$server->getL10N($application, $language); } /** |