Merge branch 'master' into 'master'

Fix ライゼオル・ホールスラスター

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

00:00:11

 
  Prepare2
passed #128547
linux
json

00:00:16

passed #128548
linux
json2

00:00:16

 
  Pack
passed #128549
linux
neos

00:00:13

passed #128550
linux
pack

00:00:12

passed #128551
linux
server

00:00:09

 
  Deploy
passed #128555
linux
deploy_to_koishi

00:00:20

passed #128554
linux
deploy_to_tiramisu

00:00:21

passed #128552
linux
upload_neos

00:00:09

passed #128553
linux
upload_version_json

00:00:10