Blade Barringer dcd4be71ba Merge pull request #5095 from hairlessbear/settings_button_name_change ... Changed button title to match dropdown settings menu titles		2015-04-26 19:32:58 -05:00
..
main	Fixed errors caused by poor git-fu.	2015-03-31 08:55:16 -04:00
options	Merge pull request #5095 from hairlessbear/settings_button_name_change	2015-04-26 19:32:58 -05:00
shared	Merge branch 'hairlessbear-hide_challenge_achievement' into develop	2015-04-25 22:15:37 -05:00
static	Merge pull request #5048 from Rbrinkley/patch-1	2015-04-22 15:34:22 +10:00
avatar-static.jade	Moved folders to website directory	2015-02-03 14:10:55 -06:00
index.jade	Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert	2015-02-05 11:20:40 -06:00