Merge remote-tracking branch 'origin/rewrite' into rewrite

This commit is contained in:
Leo Horie 2016-06-20 22:25:58 -04:00
commit 816363eebf
2 changed files with 2 additions and 2 deletions

View file

@ -4,7 +4,7 @@ Mithril was originally written by Leo Horie, but it is where it is today thanks
Special thanks to:
- Pat Tivac, who exposed most of the public API for Mithril 1.0 and brought in test coverage
- Pat Cavit, who exposed most of the public API for Mithril 1.0 and brought in test coverage
- Isiah Meadows, who brought in linting, modernized the test suite and has been a strong voice in design discussions
- Zoli Kahan, who replaced the original Promise implementation with one that actually worked properly
- Alec Embke, who single-handedly wrote the JSON-P implementation

View file

@ -1,7 +1,7 @@
T.time("Setup");
var Stream = require("../../util/stream")
var requestService = require("../../request/request")(window, Stream)
var requestService = require("../../request/request")(window)
var request = requestService.xhr
var m = require("../../render/hyperscript")
var trust = require("../../render/trust")