Merge branch 'patch-7' into 'master'

Fix 竜王絶火ゾロア

See merge request !153
10 jobs for master in 3 minutes (queued for 3 seconds)
Status Job ID Name Coverage
  Prepare
passed #148873
linux
merge_databases

00:01:39

 
  Prepare2
passed #148874
linux
json

00:00:35

passed #148875
linux
json2

00:00:34

 
  Pack
passed #148876
linux
neos

00:00:22

passed #148877
linux
pack

00:00:18

passed #148878
linux
server

00:00:14

 
  Deploy
passed #148882
linux
deploy_to_koishi

00:00:22

passed #148881
linux
deploy_to_tiramisu

00:00:19

passed #148879
linux
upload_neos

00:00:11

passed #148880
linux
upload_version_json

00:00:11