Merge branch 'patch-1' into 'master'

fix--パルマ・ライゼオル

See merge request !70
10 jobs for master in 1 minute (queued for 2 seconds)
Status Job ID Name Coverage
  Prepare
passed #128094
linux
merge_databases

00:00:15

 
  Prepare2
passed #128095
linux
json

00:00:13

passed #128096
linux
json2

00:00:10

 
  Pack
passed #128097
linux
neos

00:00:17

passed #128098
linux
pack

00:00:09

passed #128099
linux
server

00:00:09

 
  Deploy
passed #128103
linux
deploy_to_koishi

00:00:12

passed #128102
linux
deploy_to_tiramisu

00:00:12

passed #128100
linux
upload_neos

00:00:05

passed #128101
linux
upload_version_json

00:00:06