Merge remote-tracking branch 'origin/master' into guild_reward

Browse Source

...

This commit is contained in:

nEEtdo0d

2020-12-29 13:18:37 -05:00

parent f31dca614e c173135cf9

commit 96a335763d

5 changed files with 4 additions and 3 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/ui/CAMPAIGN_MENU_GOTO_EVENT.BUTTON.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 102 KiB

BIN

assets/en/ui/CAMPAIGN_MENU_GOTO_EVENT.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB