Merge branch 'patch-2' into 'master'

Fix 五月豹

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

00:00:08

 
  Prepare2
passed #117010
linux
json

00:00:25

passed #117011
linux
json2

00:00:24

 
  Pack
passed #117012
linux
neos

00:00:16

passed #117013
linux
pack

00:00:11

passed #117014
linux
server

00:00:06

 
  Deploy
passed #117018
linux
deploy_to_koishi

00:00:11

passed #117017
linux
deploy_to_tiramisu

00:00:09

passed #117015
linux
upload_neos

00:00:06

passed #117016
linux
upload_version_json

00:00:09