Merge branch 'master' into routing

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

1 files changed, 1 insertions, 9 deletions

diff --git a/lib/public/response.php b/lib/public/response.php
index febb3f14361..95e67a85720 100644
--- a/lib/public/response.php
+++ b/lib/public/response.php
@@ -34,8 +34,6 @@ namespace OCP;
  * This class provides convinient functions to send the correct http response headers
  */
 class Response {
-
-
 	/**
 	* @brief Enable response caching by sending correct HTTP headers
 	* @param $cache_time time to cache the response
@@ -47,7 +45,6 @@ class Response {
 		return(\OC_Response::enableCaching( $cache_time ));
 	}
 
-
 	/**
 	* Checks and set Last-Modified header, when the request matches sends a
 	* 'not modified' response
@@ -57,7 +54,6 @@ class Response {
 		return(\OC_Response::setLastModifiedHeader( $lastModified ));
 	}
 
-
 	/**
 	* @brief disable browser caching
 	* @see enableCaching with cache_time = 0
@@ -66,7 +62,6 @@ class Response {
 		return(\OC_Response::disableCaching());
 	}
 
-
 	/**
 	* Checks and set ETag header, when the request matches sends a
 	* 'not modified' response
@@ -76,7 +71,6 @@ class Response {
 		return(\OC_Response::setETagHeader( $etag ));
 	}
 
-
 	/**
 	* @brief Send file as response, checking and setting caching headers
 	* @param $filepath of file to send
@@ -102,6 +96,4 @@ class Response {
 	static public function redirect( $location ) {
 		return(\OC_Response::redirect( $location ));
 	}
-
-
-}
+}
\ No newline at end of file