diff options
| author | isaacs <i@izs.me> | 2012-09-13 02:13:07 +0400 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2012-09-13 02:13:07 +0400 |
| commit | bb207c2827cd758dd273adb28badeb9ec2586939 (patch) | |
| tree | 0ce4270a6a138345b41ce738eb8e517c7b890d7b /tools | |
| parent | d3fa0dcb89d986f267b2394d347ef30f6a03dc56 (diff) | |
| parent | 451ff1540ab536237e8d751d241d7fc3391a4087 (diff) | |
Merge remote-tracking branch 'ry/v0.8' into master
Conflicts:
ChangeLog
src/node_version.h
test/simple/test-util-inspect.js
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/doc/node_modules/marked/lib/marked.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/doc/node_modules/marked/lib/marked.js b/tools/doc/node_modules/marked/lib/marked.js index c6f3d0ac808..e76178471a1 100644 --- a/tools/doc/node_modules/marked/lib/marked.js +++ b/tools/doc/node_modules/marked/lib/marked.js @@ -611,7 +611,7 @@ var escape = function(html, encode) { .replace(/</g, '<') .replace(/>/g, '>') .replace(/"/g, '"') - .replace(/'/g, '''); + .replace(/'/g, '''); }; var mangle = function(text) { |