Merge pull request #52 from ralph/default-proxy

alexcrichton · alexcrichton · commit 9d0101f0daf0 · 2014-11-21T11:26:40.000-06:00
add default proxy address to .ember-cli
diff --git a/.ember-cli b/.ember-cli
@@ -5,5 +5,6 @@
 
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
+  "proxy": "http://127.0.0.1:8888/",
   "disableAnalytics": false
 }

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,6 @@`
`5`	`5`
`6`	`6`	Setting `disableAnalytics` to true will prevent any data from being sent.
`7`	`7`	`*/`
	`8`	`+ "proxy": "http://127.0.0.1:8888/",`
`8`	`9`	`"disableAnalytics": false`
`9`	`10`	`}`