Tyler Renelle 184e145914 Merge remote-tracking branch 'refs/remotes/nmjones/develop' into develop ... Conflicts: views/options/settings.jade		2014-08-23 16:05:17 -06:00
..
inventory	feat(quests): parrot quest	2014-08-18 19:04:31 -06:00
social	add quest image to party page for collection quests - fixes https://github.com/HabitRPG/habitrpg/issues/3892	2014-08-21 06:27:01 +10:00
index.jade	Remove top level tabbed navigation and gem wallet	2014-04-03 09:21:42 +01:00
profile.jade	Merge pull request #3841 from Alys/defaultAvatar	2014-08-05 08:14:09 +10:00
settings.jade	Merge remote-tracking branch 'refs/remotes/nmjones/develop' into develop	2014-08-23 16:05:17 -06:00