Merge branch 'master' into nonprofit-show

Conflicts: controllers/challenges.js controllers/courseware.js
2015-03-30 16:17:04 -07:00
parent 106a10edca 9fe8bf2fbf
commit 18a9818200
5 changed files with 116 additions and 28 deletions
--- a/models/User.js
+++ b/models/User.js
@@ -280,10 +280,6 @@ var userSchema = new mongoose.Schema({
            type: String,
            default: ''
        },
-        coderbyteProfile: {
-            type: String,
-            default: ''
-        },
        codepenProfile: {
            type: String,
            default: ''