Merge pull request #1105 from LmeSzinc/dev

Browse Source

Fix: [EN] merge dev into master

...

This commit is contained in:

nEEtdo0d

2022-05-07 20:34:23 -04:00

committed by GitHub

parent b6232fefa6 cb1f92d56f

commit 6e5ef03c61

6 changed files with 36 additions and 24 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/en/guild/BATTLE_STATUS_CF.png

Binary file not shown.

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

BIN

assets/en/guild/EXP_INFO_CF.png

Binary file not shown.

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