Resolve merge conflicts using Webstorm's merge integration tool.

2015-04-17 00:11:13 -04:00
parent 56e45ba9dd 9c67d4988f
commit b49d2fd343
23 changed files with 1159 additions and 390 deletions
--- a/models/User.js
+++ b/models/User.js
@@ -103,6 +103,7 @@ var userSchema = new mongoose.Schema({
        }
    },
    resetPasswordToken: String,
+    sentSlackInvite: false,
    resetPasswordExpires: Date,
    uncompletedBonfires: Array,
    completedBonfires: [