Merge branch 'patch-2' into 'master'

Fix 魂の結束-ソウル・ユニオン

See merge request !179
10 jobs for master in 1 minute and 57 seconds (queued for 8 seconds)
Status Job ID Name Coverage
  Prepare
passed #171719
linux
merge_databases

00:00:21

 
  Prepare2
passed #171720
linux
json

00:00:25

passed #171721
linux
json2

00:00:09

 
  Pack
passed #171722
linux
neos

00:00:14

passed #171723
linux
pack

00:00:18

passed #171724
linux
server

00:00:10

 
  Deploy
passed #171728
linux
deploy_to_koishi

00:00:50

passed #171727
linux
deploy_to_tiramisu

00:00:20

passed #171725
linux
upload_neos

00:00:08

passed #171726
linux
upload_version_json

00:00:14