Merge branch 'resize-pet-dragon-hydra' of https://github.com/bcseda/habitrpg-shared into bcseda-resize-pet-dragon-hydra

Conflicts:
	img/sprites/spritesmith/stable/pets/Pet-Dragon-Hydra.png
This commit is contained in:
Blade Barringer 2014-12-30 15:01:52 -06:00
commit 6b88ad6f2a

View file

@ -57,8 +57,4 @@
width: 105px;
height: 72px;
background: url("../img/sprites/backer-only/BackerOnly-Pet-CerberusPup.gif") no-repeat;
}
/*.Pet-Dragon-Hydra {
width: 106px;
height: 89px;
}*/
}