Merge branch 'beta' into stable

This commit is contained in:
Max Brunsfeld 2015-09-14 14:31:39 -07:00
commit 24ba0e3643

View File

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