Merge branch 'pr/1256'

# Conflicts:
#	app/js/directives.js

app/js/directives.js

@@ -763,8 +763,14 @@ angular.module('myApp.directives', ['myApp.filters'])
           return cancelEvent(e)
         }
 
-        if (e.altKey && e.shiftKey && !e.ctrlKey && !e.metaKey &&
+        if (
-          e.keyCode >= 49 && e.keyCode <= 57) { // Alt + Shift + # , switch to conversation # where # is in [1..9]
+          (!Config.Navigator.osX && // No Mac users
+              e.altKey && e.shiftKey && !e.ctrlKey && !e.metaKey &&
+              e.keyCode >= 49 && e.keyCode <= 57 ) // Alt + Shift + # , switch to conversation # where # is in [1..9]
+          ||
+          (Config.Navigator.osX && // Mac users only
+          e.ctrlKey && e.shiftKey && !e.metaKey && !e.altKey &&
+          e.keyCode >= 49 && e.keyCode <= 57 ) ) { // Ctrl + Shift + # , switch to conversation # where # is in [1..9]
 
           var dialogNumber = e.keyCode - 49
           var dialogWraps = $(scrollableWrap).find('.im_dialog_wrap')