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 remote-tracking branch 'origin/master' into cj-make-packages-async

Browse Source 
Conflicts:
	package.json
This commit is contained in:
probablycorey
2013-10-16 12:11:35 -07:00
parent 719616aa3a 60aca173ce
commit 0ee4956109
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

@@ -81,7 +81,7 @@
"to-the-hubs": "0.7.0",
"toml": "0.3.0",
"tree-view": "0.17.0",
"ui-demo": "0.8.0",
"styleguide": "0.8.0",
"whitespace": "0.7.0",
"wrap-guide": "0.4.0",
"c-tmbundle": "1.0.0",