Commit graph

6 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
impinball
b4fb21475c Add editorconfig, resolve differences
This includes newlines, tabs, among other things.
2016-06-18 03:22:12 -04:00
Leo Horie
4b6c4254ba s/shouldUpdate/onbeforeupdate 2016-06-06 09:59:35 -04:00
Leo Horie
0ed3d20c4c documentation fixes 2016-05-26 15:21:30 -04:00
Leo Horie
cd8b8b12e6 Some documentation 2016-05-19 01:22:01 -04:00