diff options
author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-01-24 19:13:50 -0800 |
---|---|---|
committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-01-24 19:13:50 -0800 |
commit | c1b1f312035644fd33cbc59cacd7980e7ed432da (patch) | |
tree | 789d6f0b74c158d9d95414d09dbe7c6c08bd115d /deps/npm/html/doc/cli/npm-init.html | |
parent | 640912d18a63704fd493059a72b19e6367c2fc1c (diff) | |
parent | 9975ff603b5ba0e5f4b2f0ffb07474a9013dab36 (diff) | |
download | node-new-c1b1f312035644fd33cbc59cacd7980e7ed432da.tar.gz |
Merge remote-tracking branch 'upstream/v0.10'
Conflicts:
AUTHORS
ChangeLog
deps/uv/AUTHORS
deps/uv/ChangeLog
deps/uv/src/unix/process.c
deps/uv/src/version.c
lib/net.js
node.gyp
src/node_version.h
Diffstat (limited to 'deps/npm/html/doc/cli/npm-init.html')
-rw-r--r-- | deps/npm/html/doc/cli/npm-init.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/npm/html/doc/cli/npm-init.html b/deps/npm/html/doc/cli/npm-init.html index 1e75c7873c..1532c76e61 100644 --- a/deps/npm/html/doc/cli/npm-init.html +++ b/deps/npm/html/doc/cli/npm-init.html @@ -29,7 +29,7 @@ without a really good reason to do so.</p> <ul><li><a href="https://github.com/isaacs/init-package-json">https://github.com/isaacs/init-package-json</a></li><li><a href="../files/package.json.html">package.json(5)</a></li><li><a href="../cli/npm-version.html">npm-version(1)</a></li></ul> </div> -<p id="footer">npm-init — npm@1.3.23</p> +<p id="footer">npm-init — npm@1.3.25</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") |