Cole Gleason 0c935f9c9a Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop

2014-01-24 15:29:17 -06:00

..

inventory

improve(translations): merge pr and lots of fixes

2014-01-23 17:02:16 +01:00

social

Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop

2014-01-24 15:29:17 -06:00

index.jade

Update index.jade

2014-01-19 19:50:26 +01:00

profile.jade

Fix version conflict

2014-01-24 07:28:30 -02:00

settings.jade

fix(translations): merge @luveluen pull request, fix some syntax

2014-01-22 16:09:32 +01:00