Merge branch 'patch-6' into 'master'

Fix 白き森の罪宝

See merge request !134
10 jobs for master in 1 minute and 20 seconds (queued for 7 seconds)
Status Job ID Name Coverage
  Prepare
passed #140987
linux
merge_databases

00:00:17

 
  Prepare2
passed #140988
linux
json

00:00:17

passed #140989
linux
json2

00:00:17

 
  Pack
passed #140990
linux
neos

00:00:14

passed #140991
linux
pack

00:00:16

passed #140992
linux
server

00:00:06

 
  Deploy
passed #140996
linux
deploy_to_koishi

00:00:18

passed #140995
linux
deploy_to_tiramisu

00:00:11

passed #140993
linux
upload_neos

00:00:20

passed #140994
linux
upload_version_json

00:00:27