github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-26 07:19:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ak-mb-tree-sitter-on-by-default

Browse Source
This commit is contained in:
Max Brunsfeld
2018-09-05 12:45:35 -07:00
committed by GitHub
parent b3dd87dafb 051bfe5d22
commit f6f1cb5220
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package-lock.json generated
View File

@@ -3081,8 +3081,8 @@
"integrity": "sha1-6H9qFZFErfJpLkbypGQc4mnAkRk="
},
"keybinding-resolver": {
"version": "https://www.atom.io/api/packages/keybinding-resolver/versions/0.38.2/tarball",
"integrity": "sha512-8D34ekA01kvIJyFqvwABK9J9FcQCoWaC2hLh99Tkf1h8DhPE6hkPuu6qb1tQucyVa4PYXuOA3jH9myGwJ2gWxw==",
"version": "https://www.atom.io/api/packages/keybinding-resolver/versions/0.38.3/tarball",
"integrity": "sha512-c9n0wmFPV6yEBZA4KOnCf5a2RKoqu+DJO++Fqqi/FABo7Rlx92KJev/jKpdpPv2wRqAZXxmW7Q65obkE49Fjrw==",
"requires": {
"etch": "0.9.0",
"fs-plus": "^3.0.0",

4
package.json
View File

@@ -78,7 +78,7 @@
"jasmine-reporters": "1.1.0",
"jasmine-tagged": "^1.1.4",
"key-path-helpers": "^0.4.0",
"keybinding-resolver": "https://www.atom.io/api/packages/keybinding-resolver/versions/0.38.2/tarball",
"keybinding-resolver": "https://www.atom.io/api/packages/keybinding-resolver/versions/0.38.3/tarball",
"language-c": "https://www.atom.io/api/packages/language-c/versions/0.60.5/tarball",
"language-clojure": "https://www.atom.io/api/packages/language-clojure/versions/0.22.7/tarball",
"language-coffee-script": "https://www.atom.io/api/packages/language-coffee-script/versions/0.49.3/tarball",
@@ -209,7 +209,7 @@
"grammar-selector": "0.50.1",
"image-view": "0.63.1",
"incompatible-packages": "0.27.3",
"keybinding-resolver": "0.38.2",
"keybinding-resolver": "0.38.3",
"line-ending-selector": "0.7.7",
"link": "0.31.6",
"markdown-preview": "0.159.24",