Commit graph

4 commits

Author SHA1 Message Date
Leo Horie
bce2abbffd 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
2016-06-20 09:34:14 -04:00
Leo Horie
ce0c30a235 update docs 2016-06-20 09:22:00 -04:00
Isiah Meadows
02cc4ec1d6 Fix whitespace/etc. in examples (#1115) 2016-06-18 03:39:55 -04:00
Leo Horie
5265697cb2 semi-working bundle 2016-05-14 01:01:35 -04:00