Merge remote-tracking branch 'origin/masterpiece' into th_mmr
This commit is contained in:
commit
24666a89d3
689 changed files with 141788 additions and 152495 deletions
BIN
image/event/coconut_milk/coconut_milk.mp4
Normal file
BIN
image/event/coconut_milk/coconut_milk.mp4
Normal file
Binary file not shown.
BIN
image/event/coconut_milk/coconut_milk.png
Normal file
BIN
image/event/coconut_milk/coconut_milk.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 475 KiB |
|
|
@ -1,6 +1,3 @@
|
|||
normal_eng=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
|
||||
normal_thai=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
|
||||
press_eng=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
|
||||
press_thai=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
|
||||
disable_eng=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
|
||||
disable_thai=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
|
||||
normal_thai=ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png
|
||||
press_thai=ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png
|
||||
disable_thai=ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png
|
||||
BIN
image/event/swensen/bn_swensen_pay_code.png
Normal file
BIN
image/event/swensen/bn_swensen_pay_code.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.9 KiB |
Loading…
Add table
Add a link
Reference in a new issue