Merge branch 'jameskopacz-patch-261' of https://github.com/jameskopacz/freecodecamp into jameskopacz-jameskopacz-patch-261

Conflicts:
	controllers/courseware.js
This commit is contained in:
Berkeley Martinez
2015-03-31 13:43:58 -07:00
5 changed files with 46 additions and 37 deletions

View File

@@ -52,7 +52,7 @@ exports.returnNextCourseware = function(req, res, next) {
});
});
};
exports.returnIndividualCourseware = function(req, res, next) {
@@ -234,4 +234,4 @@ exports.completedCourseware = function (req, res, next) {
res.send(true)
}
});
};
};