Fix: merge master into branch

Browse Source

...

This commit is contained in:

nEEtdo0d

2022-06-04 21:13:53 -04:00

parent 6ec480f949 7c730094a3

commit ffc7fadb11

23 changed files with 248 additions and 322 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

BIN

assets/jp/shop/SHOP_MEDAL_SWIPE_END.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 21 KiB After Width:  |  Height:  |  Size: 8.7 KiB

BIN

assets/jp/shop/SHOP_MERIT_SWIPE_END.png

Binary file not shown.

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