Merge pull request atom#18855 from atom/dw-fix-open-folder

Fix "Open Folder" menu item on Windows

Merge pull request atom#18855 from atom/dw-fix-open-folder

Fix "Open Folder" menu item on Windows

attempt to fix travis build

hand resolved a merge conflict in package.json, but travis build was complaining.  I think because the lockfile is out of sync with package.json.

Merge pull request atom#18961 from atom/settings-view-0.260.1

⬆️ settings-view@0.260.1

1.35.0-beta0

1.34.0

Merge pull request atom#18601 from atom/mb-update-language-javascript

Bump language-javascript, update test w/ new scope mapping

Merge pull request atom#18601 from atom/mb-update-language-javascript

Bump language-javascript, update test w/ new scope mapping

⬆️ bracket-matcher

⬆️ bracket-matcher