Sabe Jones 35ff90b4d3 Merge remote-tracking branch 'origin/new_inn_behavior_PR' into pet-skins		2015-05-13 12:12:57 -05:00
..
main	Fixed errors caused by poor git-fu.	2015-03-31 08:55:16 -04:00
options	feat(customize): Animal skins and ears	2015-05-13 11:19:08 -05:00
shared	Merge remote-tracking branch 'origin/new_inn_behavior_PR' into pet-skins	2015-05-13 12:12:57 -05:00
static	Merge branch 'develop' into NotGonnaGitUs-develop	2015-05-08 21:02:09 -05: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