diff options
author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-01-22 08:42:05 -0800 |
---|---|---|
committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-01-22 08:42:05 -0800 |
commit | fdc3cc9d7a2d1e12c74fc0c0939d22f40e58b52b (patch) | |
tree | 0e73ef7de9054f7d9b2fe90a5aec9ad072716865 /deps/npm/html/doc/api/npm.html | |
parent | 6514a4128c3e7aa6c1bb1c6f3f018412fa76e5d9 (diff) | |
parent | 25f9e92813eda927c3d3eaa56dab3a397afadebe (diff) | |
download | node-merge-test.tar.gz |
Merge remote-tracking branch 'upstream/v0.10'merge-test
Conflicts:
node.gyp
Diffstat (limited to 'deps/npm/html/doc/api/npm.html')
-rw-r--r-- | deps/npm/html/doc/api/npm.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/deps/npm/html/doc/api/npm.html b/deps/npm/html/doc/api/npm.html index bd454ac50..7695b3171 100644 --- a/deps/npm/html/doc/api/npm.html +++ b/deps/npm/html/doc/api/npm.html @@ -24,7 +24,7 @@ npm.load([configObject], function (er, npm) { <h2 id="VERSION">VERSION</h2> -<p>1.3.23</p> +<p>1.3.24</p> <h2 id="DESCRIPTION">DESCRIPTION</h2> @@ -92,7 +92,7 @@ method names. Use the <code>npm.deref</code> method to find the real name.</p> <pre><code>var cmd = npm.deref("unp") // cmd === "unpublish"</code></pre> </div> -<p id="footer">npm — npm@1.3.23</p> +<p id="footer">npm — npm@1.3.24</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") |