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

Merge branch 'master' into chrome35

Browse Source 
Conflicts:
	package.json
This commit is contained in:
Kevin Sawicki
2014-07-28 14:40:14 -07:00
parent 7f882b00f5 b0aa5e6c88
commit 431555195a
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@@ -1,7 +1,7 @@
{
"name": "atom",
"productName": "Atom",
"version": "0.120.0",
"version": "0.121.0",
"description": "A hackable text editor for the 21st Century.",
"main": "./src/browser/main.js",
"repository": {
@@ -80,7 +80,7 @@
"command-palette": "0.24.0",
"deprecation-cop": "0.7.0",
"dev-live-reload": "1.0.0",
"exception-reporting": "0.18.0",
"exception-reporting": "0.19.0",
"feedback": "0.33.0",
"find-and-replace": "0.127.0",
"fuzzy-finder": "0.57.0",