diff options
author | Bert Belder <bertbelder@gmail.com> | 2012-08-28 02:54:22 +0200 |
---|---|---|
committer | Bert Belder <bertbelder@gmail.com> | 2012-08-28 02:54:22 +0200 |
commit | bf16d9280ea7aadce5c5437184c1d80e651a997a (patch) | |
tree | 85c570a9c80181c9bd84ce8bcc726d644daa36db /deps/npm/html/doc/disputes.html | |
parent | 4822d780bb913c9ef7c2301a181a5834887cddb4 (diff) | |
parent | 24184345688e1f545ffc87e5742de06ed9855007 (diff) | |
download | node-bf16d9280ea7aadce5c5437184c1d80e651a997a.tar.gz |
Merge branch 'v0.8'
Conflicts:
ChangeLog
deps/openssl/openssl.gyp
src/node_version.h
Diffstat (limited to 'deps/npm/html/doc/disputes.html')
-rw-r--r-- | deps/npm/html/doc/disputes.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/npm/html/doc/disputes.html b/deps/npm/html/doc/disputes.html index 5cda8b1af..fc37c7533 100644 --- a/deps/npm/html/doc/disputes.html +++ b/deps/npm/html/doc/disputes.html @@ -80,7 +80,7 @@ license statement)</li><li>Illegal content.</li></ol> <ul><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/owner.html">owner(1)</a></li></ul> </div> -<p id="footer">disputes — npm@1.1.49</p> +<p id="footer">disputes — npm@1.1.59</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") |