diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2014-05-27 15:03:12 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2014-06-27 11:10:45 -0400 |
| commit | 4f776e5ff91c48891f02d1ca3ba31132477d3972 (patch) | |
| tree | 0442f37e89e0df1a14d0b5a6586e5f1ab46e4f16 | |
| parent | 712e78c47fc3e550dabbb44055e5bf7877871bff (diff) | |
| download | jquery-4f776e5ff91c48891f02d1ca3ba31132477d3972.tar.gz jquery-4f776e5ff91c48891f02d1ca3ba31132477d3972.zip | |
Build: Update license
Closes gh-1587
| -rw-r--r-- | LICENSE.txt (renamed from MIT-LICENSE.txt) | 20 | ||||
| -rw-r--r-- | package.json | 2 |
2 files changed, 19 insertions, 3 deletions
diff --git a/MIT-LICENSE.txt b/LICENSE.txt index cdd31b5c7..5bf4f5e68 100644 --- a/MIT-LICENSE.txt +++ b/LICENSE.txt @@ -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. diff --git a/package.json b/package.json index 46cb4b8f3..d6e90e50c 100644 --- a/package.json +++ b/package.json @@ -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": {}, |