Merge remote-tracking branch 'upstream/master' into ux-improvements

2015-03-28 02:51:52 +09:00
parent 25ae3ec909 e915e74b8d
commit 29e29d5687
7 changed files with 11 additions and 209 deletions
--- a/app.js
+++ b/app.js
@@ -389,8 +389,6 @@ app.get('/account/api', userController.getAccountAngular);
 */

 app.get('/api/github', resourcesController.githubCalls);
-app.get('/api/blogger', resourcesController.bloggerCalls);
-app.get('/api/trello', resourcesController.trelloCalls);

 /**
 * Bonfire related routes