Tyler Renelle 3a5eda1e98 Merge remote-tracking branch 'origin/sabe/attributes' into develop ... Conflicts: views/shared/footer.jade		2014-01-04 16:02:22 -07:00
..
inventory	Merge remote-tracking branch 'origin/sabe/rebirth' into develop	2013-12-31 08:04:51 -07:00
social	challenges: add "official habitrpg challenge" option	2014-01-03 13:36:13 -07:00
admin.jade	admin: add section in admin page for manually granting gems and	2013-12-25 20:33:21 -07:00
index.jade	contrib: add Admin page to update contributor status. Start migrating from User.backer => User.contributor	2013-11-06 15:59:56 -08:00
profile.jade	Merge branch 'develop' into sabe/attributes	2014-01-01 12:42:53 -06:00
settings.jade	add note to custom-day-start property, warning users against using it (@wc8)	2014-01-02 17:16:55 -07:00