gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into challenges

Browse Source 
Conflicts:
	app.js
This commit is contained in:
Michael Q Larson
2014-12-16 10:45:59 -08:00
parent 7dc1b2fc9b b4914fa497
commit 5497987506
4 changed files with 45 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app.js
View File

@ -131,6 +131,8 @@ app.get(
app.get('/learn-to-code', resourcesController.learnToCode);
app.get('/privacy', resourcesController.privacy);
app.get('/jquery-exercises', resourcesController.jqueryExercises);
app.get('/live-pair-programming', resourcesController.livePairProgramming);
app.get('/javascript-in-your-inbox', resourcesController.javaScriptInYourInbox);
app.get('/chromebook', resourcesController.chromebook);
app.get('/pair-program-with-team-viewer', resourcesController.pairProgramWithTeamViewer);
app.get('/done-with-first-100-hours', resourcesController.doneWithFirst100Hours);
@ -245,4 +247,4 @@ app.listen(app.get('port'), function() {
);
});
module.exports = app;
module.exports = app;