github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-17 01:51:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into chrome35

Browse Source 
Conflicts:
	package.json
This commit is contained in:
Nathan Sobo
2014-07-24 17:40:37 -07:00
parent 8ad8be2583 8cc1029bbf
commit 7515fd94ba
5 changed files with 65 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@@ -95,14 +95,14 @@
"open-on-github": "0.29.0",
"package-generator": "0.31.0",
"release-notes": "0.35.0",
"settings-view": "0.134.0",
"settings-view": "0.135.0",
"snippets": "1.1.0",
"spell-check": "1.0.0",
"status-bar": "0.41.0",
"styleguide": "0.29.0",
"symbols-view": "1.0.0",
"tabs": "0.47.0",
"timecop": "0.21.0",
"timecop": "0.22.0",
"tree-view": "1.1.0",
"update-package-dependencies": "0.6.0",
"welcome": "0.17.0",