Merge branch 'patch-1' into 'master'

fix--Mimighoul Fork

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

00:00:13

 
  Prepare2
passed #136492
linux
json

00:00:19

passed #136493
linux
json2

00:00:14

 
  Pack
passed #136494
linux
neos

00:00:15

passed #136495
linux
pack

00:00:14

passed #136496
linux
server

00:00:14

 
  Deploy
passed #136500
linux
deploy_to_koishi

00:00:13

passed #136499
linux
deploy_to_tiramisu

00:00:24

passed #136497
linux
upload_neos

00:00:10

passed #136498
linux
upload_version_json

00:00:13