krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	public/css/index.styl
This commit is contained in:
Tyler Renelle
2013-09-11 17:18:36 -04:00
parent 9b78e4e7fa 2f8c9fea78
commit bf032ce808
4 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/models/user.js
View File

@@ -87,7 +87,7 @@ var UserSchema = new Schema({
/* FIXME remove?*/
invitations: {
guilds: Array,
guilds: {type: Array, 'default': []},
party: Schema.Types.Mixed
},
items: {