Merge branch 'patch-1' into 'master'

fix--Mimighoul Charm

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

00:00:14

 
  Prepare2
passed #134863
linux
json

00:00:25

passed #134864
linux
json2

00:00:15

 
  Pack
passed #134865
linux
neos

00:00:24

passed #134866
linux
pack

00:00:14

passed #134867
linux
server

00:00:08

 
  Deploy
passed #134871
linux
deploy_to_koishi

00:00:22

passed #134870
linux
deploy_to_tiramisu

00:00:13

passed #134868
linux
upload_neos

00:00:07

passed #134869
linux
upload_version_json

00:00:12