diff options
| author | isaacs <i@izs.me> | 2014-02-12 18:16:32 -0800 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-02-13 16:35:41 -0800 |
| commit | 55543d3c45777e2867b86109454e1686e9956c5f (patch) | |
| tree | bc1d3704983fd2e589cc7755f85ec7f7b8a04a7c /deps/npm/LICENSE | |
| parent | 37376debe54ccd2889174ebb8ffc3949e0bda298 (diff) | |
| download | android-node-v8-55543d3c45777e2867b86109454e1686e9956c5f.tar.gz android-node-v8-55543d3c45777e2867b86109454e1686e9956c5f.tar.bz2 android-node-v8-55543d3c45777e2867b86109454e1686e9956c5f.zip | |
npm: Upgrade to v1.4.0
- Removes 'npm publish -f'
- Documentation
- Bug-fixes
- Update license etc to refer to npm, Inc. rather than @isaacs personally
Diffstat (limited to 'deps/npm/LICENSE')
| -rw-r--r-- | deps/npm/LICENSE | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/deps/npm/LICENSE b/deps/npm/LICENSE index 764bb87184..2c0baba401 100644 --- a/deps/npm/LICENSE +++ b/deps/npm/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) Isaac Z. Schlueter +Copyright (c) npm, Inc. and Contributors All rights reserved. npm is released under the Artistic License 2.0. @@ -214,7 +214,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------- -"Node.js" and "node" trademark Joyent, Inc. npm is not officially +"Node.js" and "node" trademark Joyent, Inc. npm is not officially part of the Node.js project, and is neither owned by nor officially affiliated with Joyent, Inc. |