Merge branch 'master' into routing

Conflicts:
	apps/files/js/filelist.js
	core/js/js.js
	lib/ocs.php

1 files changed, 6 insertions, 17 deletions

diff --git a/lib/public/files.php b/lib/public/files.php
index 2f4f459bd91..90889c59ad8 100644
--- a/lib/public/files.php
+++ b/lib/public/files.php
@@ -34,8 +34,6 @@ namespace OCP;
  * This class provides access to the internal filesystem abstraction layer. Use this class exlusively if you want to access files
  */
 class Files {
-
-
 	/**
 	 * @brief Recusive deletion of folders
 	 * @param string $dir path to the folder
@@ -45,7 +43,6 @@ class Files {
 		\OC_Helper::rmdirr( $dir );
 	}
 
-
 	/**
 	 * get the mimetype form a local file
 	 * @param string path
@@ -56,7 +53,6 @@ class Files {
 		return(\OC_Helper::getMimeType( $path ));
 	}
 
-
 	/**
 	 * copy the contents of one stream to another
 	 * @param resource source
@@ -67,7 +63,6 @@ class Files {
 		return(\OC_Helper::streamCopy( $source, $target ));
 	}
 
-
 	/**
 	 * create a temporary file with an unique filename
 	 * @param string postfix
@@ -79,7 +74,6 @@ class Files {
 		return(\OC_Helper::tmpFile( $postfix ));
 	}
 
-
 	/**
 	 * create a temporary folder with an unique filename
 	 * @return string
@@ -90,7 +84,6 @@ class Files {
 		return(\OC_Helper::tmpFolder());
 	}
 
-
 	/**
 	 * Adds a suffix to the name in case the file exists
 	 *
@@ -102,16 +95,12 @@ class Files {
 		return(\OC_Helper::buildNotExistingFileName( $path, $filename ));
 	}
 
-        /**
-         * @param string appid
-         * @param $app app
-         * @return OC_FilesystemView
-         */
-        public static function getStorage( $app ) {
+	/**
+	 * @param string appid
+	 * @param $app app
+	 * @return OC_FilesystemView
+	 */
+	public static function getStorage( $app ) {
 		return \OC_App::getStorage( $app );
 	}
-
-
-
-
 }