Merge branch 'patch-1' into 'master'

fix--登竜華幻朧門

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

00:00:15

 
  Prepare2
passed #131807
linux
json

00:00:17

passed #131808
linux
json2

00:00:13

 
  Pack
passed #131809
linux
neos

00:00:13

passed #131810
linux
pack

00:00:08

passed #131811
linux
server

00:00:11

 
  Deploy
passed #131815
linux
deploy_to_koishi

00:00:17

passed #131814
linux
deploy_to_tiramisu

00:00:13

passed #131812
linux
upload_neos

00:00:05

passed #131813
linux
upload_version_json

00:00:11