Merge branch 'patch-3' into 'master'

fix--ドレイク・シャーク

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

00:00:12

 
  Prepare2
passed #124273
linux
json

00:00:16

passed #124274
linux
json2

00:00:16

 
  Pack
passed #124275
linux
neos

00:00:16

passed #124276
linux
pack

00:00:12

passed #124277
linux
server

00:00:08

 
  Deploy
passed #124281
linux
deploy_to_koishi

00:00:10

passed #124280
linux
deploy_to_tiramisu

00:00:11

passed #124278
linux
upload_neos

00:00:06

passed #124279
linux
upload_version_json

00:00:08