diff --git a/LICENSE b/LICENSE index 796e16c2a..493db50ed 100644 --- a/LICENSE +++ b/LICENSE @@ -1 +1,20 @@ -Copyright 2014 GitHub, Inc. +Copyright (c) 2013 GitHub Inc. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/package.json b/package.json index 23add34e6..8814dd72e 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,12 @@ "bugs": { "url": "https://github.com/atom/atom/issues" }, - "license": "All Rights Reserved", + "licenses": [ + { + "type": "MIT", + "url": "http://github.com/atom/atom/raw/master/LICENSE.md" + } + ], "atomShellVersion": "0.11.10", "dependencies": { "async": "0.2.6",