summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2019-03-13 00:06:46 +0100
committerGitHub <noreply@github.com>2019-03-13 00:06:46 +0100
commitf0c85a0f5f84f6bacd4a58520669a71aff944660 (patch)
treedabe321d80514e6afa7019117d8a68fd25c76a77 /apps/files_trashbin/lib
parent33c34ddafafe5f8f815dbde94dc477758d67db20 (diff)
parent5cc5107cba1bc35d51d28569bf46813cc89f26c6 (diff)
downloadnextcloud-server-f0c85a0f5f84f6bacd4a58520669a71aff944660.tar.gz
nextcloud-server-f0c85a0f5f84f6bacd4a58520669a71aff944660.zip
Merge pull request #6512 from coletivoEITA/add_circles_sharing_to_caldav
Change CALDAV to allow calendars be shared with circles.
Diffstat (limited to 'apps/files_trashbin/lib')
-rw-r--r--apps/files_trashbin/lib/AppInfo/Application.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/files_trashbin/lib/AppInfo/Application.php b/apps/files_trashbin/lib/AppInfo/Application.php
index 06a34e0df84..761298673ac 100644
--- a/apps/files_trashbin/lib/AppInfo/Application.php
+++ b/apps/files_trashbin/lib/AppInfo/Application.php
@@ -61,7 +61,8 @@ class Application extends App {
\OC::$server->getGroupManager(),
\OC::$server->getShareManager(),
\OC::$server->getUserSession(),
- \OC::$server->getConfig()
+ \OC::$server->getConfig(),
+ \OC::$server->getAppManager()
);
});