Merge branch 'patch-7' into 'master'

Fix 紋章獣グリフォン

See merge request !158
10 jobs for master in 1 minute and 36 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Prepare
passed #150554
linux
merge_databases

00:00:11

 
  Prepare2
passed #150555
linux
json

00:00:26

passed #150556
linux
json2

00:00:26

 
  Pack
passed #150557
linux
neos

00:00:23

passed #150558
linux
pack

00:00:19

passed #150559
linux
server

00:00:10

 
  Deploy
passed #150563
linux
deploy_to_koishi

00:00:33

passed #150562
linux
deploy_to_tiramisu

00:00:16

passed #150560
linux
upload_neos

00:00:11

passed #150561
linux
upload_version_json

00:00:13