Blade Barringer 7f10049b37 Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat ...

Conflicts:
	views/options/social/chat-message.jade

2014-12-18 21:55:50 -06:00

..

inventory

fix(seasonal): Leslie link

2014-12-17 18:27:37 -06:00

social

Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat

2014-12-18 21:55:50 -06:00

index.jade

Fixed weirdness on create guild page. Elements were overflowing out of

2014-12-07 20:52:49 -06:00

profile.jade

fix(avatar): Correct "Facial Hair" text

2014-12-13 16:07:58 -06:00

settings.jade

fix(plans): lots of bug fixes & cleanup

2014-12-03 16:01:57 -07:00