Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp

2015-05-26 00:33:25 -07:00
parent 7581ed9b30 6b9044febd
commit cf6232192f
1 changed files with 4 additions and 1 deletions
--- a/app.js
+++ b/app.js
@ -273,7 +273,10 @@ app.get('/nonprofits/getNonprofitList', nonprofitController.showAllNonprofits);

 app.get('/nonprofits-form', resourcesController.nonprofitsForm);

-app.get('/map', challengeMapController.challengeMap);
+app.get('/map',
+  userController.userMigration,
+  challengeMapController.challengeMap
+);

 app.get('/live-pair-programming', function(req, res) {
  res.redirect(301, '/field-guide/live-stream-pair-programming-on-twitch.tv');