Merge branch 'master' into cleanup-list-code

Conflicts:
	apps/files_sharing/ajax/list.php

1 files changed, 3 insertions, 3 deletions

diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index 38de3360f2b..0b624b27176 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -63,10 +63,10 @@ class Dropbox extends \OC\Files\Storage\Common {
 	}
 
 	/**
-	 * @brief Returns the path's metadata
+	 * Returns the path's metadata
 	 * @param string $path path for which to return the metadata
-	 * @param $list if true, also return the directory's contents
-	 * @return directory contents if $list is true, file metadata if $list is
+	 * @param bool $list if true, also return the directory's contents
+	 * @return mixed directory contents if $list is true, file metadata if $list is
 	 * false, null if the file doesn't exist or "false" if the operation failed
 	 */
 	private function getMetaData($path, $list = false) {