Merge remote-tracking branch 'origin/rewrite' into rewrite
Conflicts: docs/keys.md docs/signatures.md docs/v1.x-migration.md index.js ospec/bin/ospec.cmd request/request.js request/tests/test-xhr.js util/prop.js util/tests/index.html util/tests/test-prop.js
This commit is contained in:
commit
bce2abbffd
107 changed files with 1989 additions and 1970 deletions
|
|
@ -43,4 +43,4 @@ traverseDirectory(".", function(pathname, stat, children) {
|
|||
|
||||
process.on("unhandledRejection", function(e) {
|
||||
console.log("Uncaught (in promise) " + e.stack)
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
node ospec
|
||||
node ospec
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue