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 wl-electron-35

Browse Source
This commit is contained in:
Max Brunsfeld
2016-02-16 13:16:13 -08:00
parent 81c15bd8b4 cfab689de1
commit 4bc969d1df
24 changed files with 426 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package.json
View File

@@ -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"
]
}
}