Merge branch 'patch-2' into 'master'

fix--魔轟神獣ベヒルモス

See merge request !117
12 jobs for 7.8 in 1 minute and 16 seconds (queued for 4 seconds)
latest
Status Job ID Name Coverage
  Prepare
passed #137411
linux
merge_databases

00:00:11

 
  Prepare2
passed #137412
linux
json

00:00:24

passed #137413
linux
json2

00:00:15

 
  Pack
passed #137414
linux
neos

00:00:11

passed #137415
linux
pack

00:00:10

passed #137416
linux
server

00:00:11

 
  Deploy
passed #137420
linux
deploy

00:00:21

passed #137422
linux
deploy_to_koishi

00:00:25

passed #137421
linux
deploy_to_tiramisu

00:00:15

passed #137417
linux
upload_archive

00:00:07

passed #137418
linux
upload_data

00:00:08

passed #137419
linux
upload_version_json

00:00:09