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

Conflicts:
	public/css/inventory.styl
This commit is contained in:
benmanley 2014-03-10 20:20:58 +00:00
commit e4e6100652

View file

@ -105,6 +105,7 @@ menu.pets .customize-menu
.pet-button
border: none
background: none white
.pet-not-owned
width: 81px;
height: 99px;