Merge branch 'master' into upgrade-b-c-ts-again

chriskrycho · web-flow · commit a1c0d792e9da · 2017-10-04T23:19:45.000-04:00
diff --git a/blueprints/ember-cli-typescript/files/app/config/environment.d.ts b/blueprints/ember-cli-typescript/files/app/config/environment.d.ts
@@ -11,5 +11,6 @@ declare namespace config {
   export var environment: any;
   export var modulePrefix: string;
   export var podModulePrefix: string;
-  export var locationType: string;
+  export var locationType: string;    
+  export var rootURL: string;
 }

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,6 @@ declare namespace config {`
`11`	`11`	`export var environment: any;`
`12`	`12`	`export var modulePrefix: string;`
`13`	`13`	`export var podModulePrefix: string;`
`14`		`- export var locationType: string;`
	`14`	`+ export var locationType: string;`
	`15`	`+ export var rootURL: string;`
`15`	`16`	`}`