Merge branch 'patch-1' into 'master'

fix--E-HERO ダーク・ナイト

See merge request !97
10 jobs for master in 1 minute (queued for 5 seconds)
Status Job ID Name Coverage
  Prepare
passed #133630
linux
merge_databases

00:00:09

 
  Prepare2
passed #133631
linux
json

00:00:13

passed #133632
linux
json2

00:00:13

 
  Pack
passed #133633
linux
neos

00:00:15

passed #133634
linux
pack

00:00:12

passed #133635
linux
server

00:00:08

 
  Deploy
passed #133639
linux
deploy_to_koishi

00:00:20

passed #133638
linux
deploy_to_tiramisu

00:00:12

passed #133636
linux
upload_neos

00:00:06

passed #133637
linux
upload_version_json

00:00:06