Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

Browse source

...

This commit is contained in:

wanlop run 2024-07-25 17:51:29 +07:00

parent cc4b1c9978 e9bc7f2544

commit 3921e8a24b

18 changed files with 15056 additions and 899 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

image/collectiing/cash_warning_bg.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

image/collectiing/cash_warning_text.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 21 KiB

BIN

image/collectiing_en/cash_warning_text.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 23 KiB