github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into async-git-bumps

Browse Source
This commit is contained in:
joshaber
2016-02-18 09:40:43 -05:00
parent 2fa41d1783 3d953632e6
commit 95cdbde1ec
54 changed files with 742 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
package.json
View File

@@ -12,7 +12,7 @@
"url": "https://github.com/atom/atom/issues"
},
"license": "MIT",
"electronVersion": "0.34.5",
"electronVersion": "0.36.7",
"dependencies": {
"async": "0.2.6",
"atom-keymap": "^6.2.0",
@@ -54,7 +54,7 @@
"service-hub": "^0.7.0",
"source-map-support": "^0.3.2",
"temp": "0.8.1",
"text-buffer": "8.3.0",
"text-buffer": "8.3.1",
"typescript-simple": "1.0.0",
"underscore-plus": "^1.6.6",
"yargs": "^3.23.0"
@@ -173,7 +173,8 @@
"runs",
"spyOn",
"waitsFor",
"waitsForPromise"
"waitsForPromise",
"indexedDB"
]
}
}