Merge branch 'dev'

parthshah · parthshah · commit f56de548d571 · 2017-01-18T10:17:39.000-08:00
diff --git a/package.json b/package.json
@@ -72,7 +72,7 @@
     "restangular": "^1.5.2",
     "tc-accounts": "https://github.com/appirio-tech/accounts-app.git#0.0.7",
     "tc-angular-ellipsis": "^0.1.6",
-    "topcoder-app-r": "^1.0.0",
+    "topcoder-app-r": "https://github.com/appirio-tech/topcoder-app-r.git#0.0.1",
     "xml2js": "^0.4.16",
     "zepto": "1.0.1"
   }

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@`
`72`	`72`	`"restangular": "^1.5.2",`
`73`	`73`	`"tc-accounts": "https://github.com/appirio-tech/accounts-app.git#0.0.7",`
`74`	`74`	`"tc-angular-ellipsis": "^0.1.6",`
`75`		`- "topcoder-app-r": "^1.0.0",`
	`75`	`+ "topcoder-app-r": "https://github.com/appirio-tech/topcoder-app-r.git#0.0.1",`
`76`	`76`	`"xml2js": "^0.4.16",`
`77`	`77`	`"zepto": "1.0.1"`
`78`	`78`	`}`