Merge branch 'patch-2' into 'master'

fix--登竜華転生紋

See merge request !89
10 jobs for master in 1 minute and 10 seconds (queued for 1 second)
Status Job ID Name Coverage
  Prepare
passed #131816
linux
merge_databases

00:00:16

 
  Prepare2
passed #131817
linux
json

00:00:16

passed #131818
linux
json2

00:00:16

 
  Pack
passed #131819
linux
neos

00:00:16

passed #131820
linux
pack

00:00:15

passed #131821
linux
server

00:00:08

 
  Deploy
passed #131825
linux
deploy_to_koishi

00:00:20

passed #131824
linux
deploy_to_tiramisu

00:00:20

passed #131822
linux
upload_neos

00:00:09

passed #131823
linux
upload_version_json

00:00:09