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

pull/545/head
Quincy Larson 2015-05-26 00:33:25 -07:00
commit cf6232192f
1 changed files with 4 additions and 1 deletions

5
app.js
View File

@ -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');