LmeSzinc e918a5db97 Merge branch 'gems_farming' into dev ... # Conflicts: # module/campaign/campaign_ocr.py # module/equipment/equipment.py # module/guild/base.py		2021-07-24 17:33:58 +08:00
..
template.ini	Merge branch 'gems_farming' into dev	2021-07-24 17:33:58 +08:00