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

Merge branch 'stable' into beta

Browse Source 
Conflicts:
	package.json
	spec/workspace-spec.coffee
This commit is contained in:
Max Brunsfeld
2016-01-13 10:30:58 -08:00
parent a3a42e2d6d 0d8a3847cd
commit 2c4df2d69b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -123,7 +123,7 @@
"language-css": "0.36.0",
"language-gfm": "0.82.0",
"language-git": "0.11.0",
"language-go": "0.40.0",
"language-go": "0.42.0",
"language-html": "0.43.1",
"language-hyperlink": "0.16.0",
"language-java": "0.17.0",