Merge branch 'patch-7' into 'master'

Fix 天威無窮の境地

See merge request !132
10 jobs for master in 10 seconds (queued for 10 seconds)
Status Job ID Name Coverage
  Prepare
failed #140489
linux
merge_databases

00:00:10

 
  Prepare2
skipped #140490
linux
json
skipped #140491
linux
json2
 
  Pack
skipped #140492
linux
neos
skipped #140493
linux
pack
skipped #140494
linux
server
 
  Deploy
skipped #140498
linux
deploy_to_koishi
skipped #140497
linux
deploy_to_tiramisu
skipped #140495
linux
upload_neos
skipped #140496
linux
upload_version_json
 
Name Stage Failure
failed
merge_databases Prepare There has been a runner system failure, please try again
No job log