Merge branch 'patch-2' into 'master'

fix--Em影絵師シャドー・メイカー

See merge request !34
10 jobs for master in 59 seconds (queued for 1 second)
Status Job ID Name Coverage
  Prepare
passed #123457
linux
merge_databases

00:00:08

 
  Prepare2
passed #123458
linux
json

00:00:13

passed #123459
linux
json2

00:00:18

 
  Pack
passed #123460
linux
neos

00:00:12

passed #123461
linux
pack

00:00:10

passed #123462
linux
server

00:00:08

 
  Deploy
passed #123466
linux
deploy_to_koishi

00:00:13

passed #123465
linux
deploy_to_tiramisu

00:00:18

passed #123463
linux
upload_neos

00:00:10

passed #123464
linux
upload_version_json

00:00:09