Merge branch 'master' into api-docs

keymaps/atom.cson

@@ -44,7 +44,7 @@
   'ctrl-w w': 'window:focus-next-pane'
   'ctrl-tab': 'window:focus-next-pane'
   'ctrl-meta-f': 'window:toggle-full-screen'
-  'meta-r': 'window:reload'
+  'ctrl-alt-meta-r': 'window:reload'
   'alt-meta-i': 'window:toggle-dev-tools'
   'meta-alt-ctrl-p': 'window:run-package-specs'
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "atom",
-  "version": "31.0.0",
+  "version": "32.0.0",
   "main": "./src/browser/main.js",
   "repository": {
     "type": "git",
@@ -81,7 +81,7 @@
     "dev-live-reload": "0.11.0",
     "editor-stats": "0.5.0",
     "exception-reporting": "0.5.0",
-    "find-and-replace": "0.29.0",
+    "find-and-replace": "0.31.0",
     "fuzzy-finder": "0.15.0",
     "gfm": "0.5.0",
     "git-diff": "0.12.0",
@@ -95,12 +95,12 @@
     "metrics": "0.8.0",
     "package-generator": "0.14.0",
     "release-notes": "0.8.0",
-    "settings-view": "0.31.1",
+    "settings-view": "0.32.0",
     "snippets": "0.11.0",
     "spell-check": "0.8.0",
     "status-bar": "0.15.0",
     "styleguide": "0.9.0",
-    "symbols-view": "0.13.0",
+    "symbols-view": "0.14.0",
     "tabs": "0.7.0",
     "terminal": "0.14.0",
     "timecop": "0.7.0",