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

Conflicts: public/css/inventory.styl
2014-03-10 20:20:58 +00:00
parent db2ff45551 def83b089a
commit e4e6100652
1 changed files with 1 additions and 0 deletions
@@ -105,6 +105,7 @@ menu.pets .customize-menu
 .pet-button
    border: none
    background: none white
+
 .pet-not-owned
    width: 81px;
    height: 99px;