Merge branch 'origin-paglias-fix-guilds' into develop

Conflicts: public/css/index.styl
2013-09-11 17:18:36 -04:00
parent 9b78e4e7fa 2f8c9fea78
commit bf032ce808
4 changed files with 26 additions and 6 deletions
@@ -87,7 +87,7 @@ var UserSchema = new Schema({
  /* FIXME remove?*/

  invitations: {
-    guilds: Array,
+    guilds: {type: Array, 'default': []},
    party: Schema.Types.Mixed
  },
  items: {