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/misc/npm-coding-style.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/misc/npm-coding-style.html')
-rw-r--r-- | deps/npm/html/doc/misc/npm-coding-style.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/npm/html/doc/misc/npm-coding-style.html b/deps/npm/html/doc/misc/npm-coding-style.html index 5cc635d7d..e2c62d587 100644 --- a/deps/npm/html/doc/misc/npm-coding-style.html +++ b/deps/npm/html/doc/misc/npm-coding-style.html @@ -182,7 +182,7 @@ set to anything."</p> <ul><li><a href="../misc/npm-developers.html">npm-developers(7)</a></li><li><a href="../misc/npm-faq.html">npm-faq(7)</a></li><li><a href="../cli/npm.html">npm(1)</a></li></ul> </div> -<p id="footer">npm-coding-style — npm@1.3.23</p> +<p id="footer">npm-coding-style — npm@1.3.24</p> <script> ;(function () { var wrapper = document.getElementById("wrapper") |