Merge branch 'master' into upload-to-s3

CHANGELOG.md

@@ -9,3 +9,4 @@ See https://atom.io/releases
 * By default, windows with no pane items are now closed via the `core:close` command. The previous behavior can be restored via the `Close Empty Windows` option in settings.
 * Fixed an issue where characters were inserted when toggling the settings view on some keyboard layouts.
 * Modules can now temporarily override `Error.prepareStackTrace`. There is also an `Error.prototype.getRawStack()` method if you just need access to the raw v8 trace structure.
+* Fixed a problem that caused blurry fonts on monitors that have a slightly higher resolution than 96 DPI.

CONTRIBUTING.md

@@ -255,6 +255,7 @@ Both issue lists are sorted by total number of comments. While not perfect, numb
 * Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
 * Limit the first line to 72 characters or less
 * Reference issues and pull requests liberally
+* When only changing documentation, include `[ci skip]` in the commit description
 * Consider starting the commit message with an applicable emoji:
     * :art: `:art:` when improving the format/structure of the code
     * :racehorse: `:racehorse:` when improving performance

package.json

@@ -12,7 +12,7 @@
     "url": "https://github.com/atom/atom/issues"
   },
   "license": "MIT",
-  "electronVersion": "0.34.3",
+  "electronVersion": "0.34.5",
   "dependencies": {
     "async": "0.2.6",
     "atom-keymap": "^6.1.1",
@@ -103,7 +103,7 @@
     "open-on-github": "0.40.0",
     "package-generator": "0.41.0",
     "release-notes": "0.53.0",
-    "settings-view": "0.232.0",
+    "settings-view": "0.232.1",
     "snippets": "1.0.1",
     "spell-check": "0.63.0",
     "status-bar": "0.80.0",
@@ -116,20 +116,20 @@
     "welcome": "0.33.0",
     "whitespace": "0.32.1",
     "wrap-guide": "0.38.1",
-    "language-c": "0.50.0",
+    "language-c": "0.50.1",
     "language-clojure": "0.18.0",
-    "language-coffee-script": "0.45.0",
+    "language-coffee-script": "0.46.0",
     "language-csharp": "0.11.0",
-    "language-css": "0.35.0",
+    "language-css": "0.35.1",
     "language-gfm": "0.81.0",
     "language-git": "0.10.0",
     "language-go": "0.40.0",
     "language-html": "0.42.0",
     "language-hyperlink": "0.15.0",
-    "language-java": "0.16.1",
-    "language-javascript": "0.102.1",
+    "language-java": "0.17.0",
+    "language-javascript": "0.102.2",
     "language-json": "0.17.1",
-    "language-less": "0.28.3",
+    "language-less": "0.29.0",
     "language-make": "0.20.0",
     "language-mustache": "0.13.0",
     "language-objective-c": "0.15.0",