Merge branch 'master' into ux-improvements

Conflicts: controllers/bonfire.js controllers/resources.js views/bonfire/show.jade
2015-03-29 13:05:39 -07:00
parent 4a805729cf 47d0d8e0da
commit 70f812dc78
9 changed files with 191 additions and 53 deletions
--- a/app.js
+++ b/app.js
@ -401,6 +401,8 @@ 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