Merge branch 'thanksgiving' into develop

This commit is contained in:
Tyler Renelle
2013-11-27 11:53:18 -07:00
5 changed files with 34 additions and 18 deletions
+2 -1
View File
@@ -125,7 +125,8 @@ var UserSchema = new Schema({
{
'Wolf-Veteran': Number,
'Wolf-Cerberus': Number,
'Dragon-Hydra': Number
'Dragon-Hydra': Number,
'Turkey-Base': Number
}
),
currentPet: String, // Cactus-Desert