0f31873262
Conflicts: common/dist/sprites/habitrpg-shared.css common/dist/sprites/spritesmith1.css common/dist/sprites/spritesmith1.png common/dist/sprites/spritesmith4.css common/dist/sprites/spritesmith4.png website/views/options/social/index.jade
We need to extract any sprite-sheet css in this directory (anything that's not habitrpg-web specific) and move it to common