Merge branch 'server_folder_methods' of github.com:owncloud/core into server_folder_methods

Conflicts:
	lib/public/iservercontainer.php
	lib/server.php

2 files changed, 14 insertions, 0 deletions

diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index dcf8c162e6f..d3ee5d15dcc 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -63,6 +63,19 @@ interface IServerContainer {
 	function getRootFolder();
 
 	/**
+	 * Returns a view to ownCloud's files folder
+	 *
+	 * @return \OCP\Files\Folder
+	 */
+	function getUserFolder();
+
+	/**
+	 * Returns an app-specific view in ownClouds data directory
+	 *
+	 * @return \OCP\Files\Folder
+	 */
+	function getAppFolder();
+	/**
 	 * Returns the user session
 	 *
 	 * @return \OCP\IUserSession
diff --git a/lib/server.php b/lib/server.php
index dcfd0a2db99..fccb8fad4d0 100644
--- a/lib/server.php
+++ b/lib/server.php
@@ -211,6 +211,7 @@ class Server extends SimpleContainer implements IServerContainer {
 	function getConfig() {
 		return $this->query('AllConfig');
 	}
+
 	/**
 	 * Returns an ICache instance
 	 *