Merge pull request #14044 from trentmwillis/router-bump

rwjblue · web-flow · commit 6f5402693ebf · 2016-08-09T12:32:24.000-04:00
[BUGFIX Beta] Bump router.js so that getHandlers is invoked lazily
diff --git a/bower.json b/bower.json
@@ -12,7 +12,7 @@
   "devDependencies": {
     "backburner": "https://github.com/ebryn/backburner.js.git#b893c979cb38f9819f65561725907add1aed7b21",
     "rsvp": "https://github.com/tildeio/rsvp.js.git#3.0.20",
-    "router.js": "https://github.com/tildeio/router.js.git#7f2f7c16540570ad2c720f9bd9a7a55e4bcdc95c",
+    "router.js": "https://github.com/tildeio/router.js.git#b921fd3407064a77bd99f4f4eddc4377592ac93b",
     "dag-map": "https://github.com/krisselden/dag-map.git#1.0.2",
     "ember-dev": "https://github.com/emberjs/ember-dev.git#eace5340485bdb5e4223ab67fecf4aff31c1940c"
   }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`"devDependencies": {`
`13`	`13`	`"backburner": "https://github.com/ebryn/backburner.js.git#b893c979cb38f9819f65561725907add1aed7b21",`
`14`	`14`	`"rsvp": "https://github.com/tildeio/rsvp.js.git#3.0.20",`
`15`		`- "router.js": "https://github.com/tildeio/router.js.git#7f2f7c16540570ad2c720f9bd9a7a55e4bcdc95c",`
	`15`	`+ "router.js": "https://github.com/tildeio/router.js.git#b921fd3407064a77bd99f4f4eddc4377592ac93b",`
`16`	`16`	`"dag-map": "https://github.com/krisselden/dag-map.git#1.0.2",`
`17`	`17`	`"ember-dev": "https://github.com/emberjs/ember-dev.git#eace5340485bdb5e4223ab67fecf4aff31c1940c"`
`18`	`18`	`}`