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:
Leo Horie 2016-06-20 09:34:14 -04:00
commit bce2abbffd
107 changed files with 1989 additions and 1970 deletions

View file

@ -11,7 +11,7 @@ o.spec("jsonp", function() {
mock = xhrMock()
jsonp = new Request(mock).jsonp
})
o("works", function(done) {
mock.$defineRoutes({
"GET /item": function(request) {
@ -52,4 +52,4 @@ o.spec("jsonp", function() {
done()
})
})
})
})