ferina8-14 47adffd1a0 Merge branch 'master' into try_jp ... [JP] copy assets from cn # Conflicts: # module/combat/assets.py # module/daemon/assets.py # module/handler/assets.py # module/retire/assets.py # module/reward/assets.py		2020-06-13 03:29:35 +09:00
..
assets.py	Merge branch 'master' into try_jp	2020-06-13 03:29:35 +09:00
commission.py	Fix: [EN] Fix Miss detect lines as characters in Commission module	2020-06-08 07:54:21 -03:00
reward.py	Fix: add new day check to reward_loop	2020-06-06 21:53:31 +08:00
tactical_class.py	Fix: Re-check all timeout timer	2020-06-03 05:06:51 +08:00