Merge branch 'master' into dh-async-repo

This commit is contained in:
joshaber
2015-12-09 23:54:15 -05:00

View File

@@ -1,7 +1,7 @@
{
"name": "atom",
"productName": "Atom",
"version": "1.4.0-dev",
"version": "1.5.0-dev",
"description": "A hackable text editor for the 21st Century.",
"main": "./src/browser/main.js",
"repository": {