Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor

Conflicts:
	tests/rest/test_presence.py
	tests/rest/test_rooms.py
	tests/utils.py

1 files changed, 4 insertions, 1 deletions

diff --git a/webclient/components/fileInput/file-input-directive.js b/webclient/components/fileInput/file-input-directive.js

index 9b73f877e9..c5e4ae07a8 100644
--- a/webclient/components/fileInput/file-input-directive.js
+++ b/webclient/components/fileInput/file-input-directive.js
@@ -29,7 +29,7 @@ angular.module('mFileInput', [])
         scope: {
             selectedFile: '=mFileInput'
         },
-        
+
         link: function(scope, element, attrs, ctrl) {
             element.bind("click", function() {
                 element.find("input")[0].click();
@@ -38,6 +38,9 @@ angular.module('mFileInput', [])
                     scope.$apply();
                 });
             });
+
+            // Change the mouse icon on mouseover on this element
+            element.css("cursor", "pointer");
       }
     };
 });
\ No newline at end of file