Merge branch 'master' into crater

Browse Source

# Conflicts:
#	core/assets/sprites/sprites2.png

...

This commit is contained in:

Patrick 'Quezler' Mounier

2020-04-23 21:15:11 +02:00

parent 39266d23c8 cafd076f9c

commit cf186e0219

8 changed files with 18 additions and 21 deletions

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

Download Patch File Download Diff File Expand all files Collapse all files

core/assets/sprites/sprites5.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 129 KiB After Width:  |  Height:  |  Size: 127 KiB