Merge branch 'bundler-fix' into rewrite

Conflicts:
	api/mount.js
	api/router.js
	api/tests/test-router.js
	index.js
This commit is contained in:
Leo Horie 2016-05-20 22:45:51 -04:00
commit acd9d5b641
10 changed files with 91 additions and 548 deletions

View file

@ -4,7 +4,7 @@ var o = require("../../ospec/ospec")
var domMock = require("../../test-utils/domMock")
var m = require("../../render/hyperscript")
var createMounter = require("../mount")
var apiMounter = require("../../api/mount")
o.spec("m.mount", function() {
var FRAME_BUDGET = 1000 / 60