diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-07-30 19:40:19 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-07-30 19:40:19 -0400 |
| commit | 11d162751381963e0c8a86cf15c811cc99003654 (patch) | |
| tree | 276b5b1e67a66491ef553346087b2959f35b3bc7 /apps/files_sharing/appinfo | |
| parent | d13ba0ee2d93080ba56776442b9d39a53e2b6321 (diff) | |
| parent | d6faa89ed720da7319923cba33a83d0210216d57 (diff) | |
| download | nextcloud-server-11d162751381963e0c8a86cf15c811cc99003654.tar.gz nextcloud-server-11d162751381963e0c8a86cf15c811cc99003654.zip | |
Merge branch 'master' into sharing. Integrate with changes in master, rename classes
Conflicts:
lib/base.php
Diffstat (limited to 'apps/files_sharing/appinfo')
| -rw-r--r-- | apps/files_sharing/appinfo/app.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index 60abcda50f9..e7e19869d2a 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -2,11 +2,11 @@ require_once('apps/files_sharing/lib_share.php'); -OC_UTIL::addScript("files_sharing", "share"); -OC_APP::addNavigationSubEntry("files_index", array( +OC_Util::addScript("files_sharing", "share"); +OC_App::addNavigationSubEntry("files_index", array( "id" => "files_sharing_list", "order" => 10, - "href" => OC_HELPER::linkTo( "files_sharing", "list.php" ), + "href" => OC_Helper::linkTo( "files_sharing", "list.php" ), "name" => "Shared")); ?> |