Merge branch 'master' into bonfire

2015-01-24 11:29:43 -08:00
parent a7f228c410 34f106387d
commit e115e6da22
8 changed files with 69 additions and 11 deletions
--- a/controllers/user.js
+++ b/controllers/user.js
@ -255,7 +255,7 @@ exports.returnUser = function(req, res, next) {
      });
    } else {
      req.flash('errors', {
-        msg: "We couldn't find a Code Camper with that username."
+        msg: "404: We couldn't find a page with that url. Please double check the link."
      });
      return res.redirect('/');
    }