Merge branch 'patch-3' into 'master'

fix bug

See merge request !17
10 jobs for master in 58 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Prepare
passed #115855
linux
merge_databases

00:00:08

 
  Prepare2
passed #115856
linux
json

00:00:18

passed #115857
linux
json2

00:00:18

 
  Pack
passed #115858
linux
neos

00:00:18

passed #115859
linux
pack

00:00:16

passed #115860
linux
server

00:00:08

 
  Deploy
passed #115864
linux
deploy_to_koishi

00:00:12

passed #115863
linux
deploy_to_tiramisu

00:00:12

passed #115861
linux
upload_neos

00:00:06

passed #115862
linux
upload_version_json

00:00:07