Merge branch 'patch-6' into 'master'

Fix 聖アザミナ

See merge request !137
10 jobs for master in 1 minute and 23 seconds (queued for 6 seconds)
Status Job ID Name Coverage
  Prepare
passed #141135
linux
merge_databases

00:00:11

 
  Prepare2
passed #141136
linux
json

00:00:19

passed #141137
linux
json2

00:00:21

 
  Pack
passed #141138
linux
neos

00:00:28

passed #141139
linux
pack

00:00:26

passed #141140
linux
server

00:00:15

 
  Deploy
passed #141144
linux
deploy_to_koishi

00:00:20

passed #141143
linux
deploy_to_tiramisu

00:00:21

passed #141141
linux
upload_neos

00:00:10

passed #141142
linux
upload_version_json

00:00:11