summaryrefslogtreecommitdiff
path: root/deps/npm/html/doc/api/npm-load.html
diff options
context:
space:
mode:
authorTimothy J Fontaine <tjfontaine@gmail.com>2014-02-17 20:57:53 -0800
committerTimothy J Fontaine <tjfontaine@gmail.com>2014-02-17 20:57:53 -0800
commit466a9b5c78abef8f6c5261f33df83672d78b41b5 (patch)
tree3acb06281dbb1bf16afe77b975db5426e346094c /deps/npm/html/doc/api/npm-load.html
parente5eadcfa199298d6b6f14df43cfcdd5b478c6208 (diff)
parent562b015170c4c0bf442d49d46332fb3918173306 (diff)
downloadnode-new-466a9b5c78abef8f6c5261f33df83672d78b41b5.tar.gz
Merge remote-tracking branch 'upstream/v0.10'
Conflicts: src/node_zlib.cc
Diffstat (limited to 'deps/npm/html/doc/api/npm-load.html')
-rw-r--r--deps/npm/html/doc/api/npm-load.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/npm/html/doc/api/npm-load.html b/deps/npm/html/doc/api/npm-load.html
index 7685f003c0..af8ec7dec8 100644
--- a/deps/npm/html/doc/api/npm-load.html
+++ b/deps/npm/html/doc/api/npm-load.html
@@ -32,7 +32,7 @@ config object.</p>
<p>For a list of all the available command-line configs, see <code>npm help config</code></p>
</div>
-<p id="footer">npm-load &mdash; npm@1.4.0</p>
+<p id="footer">npm-load &mdash; npm@1.4.3</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")