Merge branch 'master' into ux-improvements

2015-03-27 10:28:31 -07:00
parent e78609171d e915e74b8d
commit c69d919d46
7 changed files with 11 additions and 209 deletions
--- a/app.js
+++ b/app.js
@ -404,8 +404,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