Merge branch 'issue-3954' of https://github.com/ebiagogo/habitrpg-shared into ebiagogo-issue-3954

Browse source

Conflicts:
	dist/spritesmith0.png
	dist/spritesmith1.png
	dist/spritesmith2.png
	dist/spritesmith3.png
	dist/spritesmith4.png
	dist/spritesmith5.png

...

This commit is contained in:

Blade Barringer 2014-12-30 14:47:22 -06:00

parent f205a28be0 a66c65f42d

commit a1e48eadd1

2 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

BIN

img/sprites/spritesmith/quests/quest_atom1.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 27 KiB After Width:  |  Height:  |  Size: 19 KiB

BIN

img/sprites/spritesmith/stable/mounts/Mount_Head_PandaCub-Skeleton.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 741 B After Width:  |  Height:  |  Size: 805 B