Merge branch 'fix-hippocrite' into develop

Browse source

...

This commit is contained in:

SabreCat 2018-04-17 01:37:20 +00:00

parent 76a10d6cf9 558dd2e4bf

commit 631bbcb786

3 changed files with 190 additions and 190 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

380

website/client/assets/css/sprites/spritesmith-main-11.css

View file

File diff suppressed because it is too large Load diff

BIN

website/client/assets/images/sprites/spritesmith-main-11.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 225 KiB After Width:  |  Height:  |  Size: 226 KiB

BIN

website/raw_sprites/spritesmith/quests/scrolls/inventory_quest_scroll_hippo.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 7.5 KiB After Width:  |  Height:  |  Size: 7.6 KiB