Permalink
Browse files

Build: Update license

Closes gh-1587
  • Loading branch information...
scottgonzalez committed May 27, 2014
1 parent 712e78c commit 4f776e5ff91c48891f02d1ca3ba31132477d3972
Showing with 19 additions and 3 deletions.
  1. +18 −2 MIT-LICENSE.txt → LICENSE.txt
  2. +1 −1 package.json
@@ -1,5 +1,14 @@
Copyright 2014 jQuery Foundation and other contributors
http://jquery.com/
Copyright 2005, 2014 jQuery Foundation and other contributors,
https://jquery.org/
This software consists of voluntary contributions made by many
individuals. For exact contribution history, see the revision history
available at https://github.com/jquery/jquery
The following license applies to all parts of this software except as
documented below:
====
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
@@ -19,3 +28,10 @@ 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.
====
All files located in the node_modules and external directories are
externally maintained libraries used by this software which have their
own licenses; we recommend you read them, as their terms may differ from
the terms above.
View
@@ -25,7 +25,7 @@
"licenses": [
{
"type": "MIT",
"url": "https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt"
"url": "https://github.com/jquery/jquery/blob/master/LICENSE.txt"
}
],
"dependencies": {},

0 comments on commit 4f776e5

Please sign in to comment.