Merge branch 'master' into 'master'

Fix マルチャミー・プルリア

See merge request !19
10 jobs for master in 53 seconds (queued for 1 second)
Status Job ID Name Coverage
  Prepare
passed #116576
linux
merge_databases

00:00:08

 
  Prepare2
passed #116577
linux
json

00:00:14

passed #116578
linux
json2

00:00:15

 
  Pack
passed #116579
linux
neos

00:00:12

passed #116580
linux
pack

00:00:14

passed #116581
linux
server

00:00:06

 
  Deploy
passed #116585
linux
deploy_to_koishi

00:00:13

passed #116584
linux
deploy_to_tiramisu

00:00:13

passed #116582
linux
upload_neos

00:00:09

passed #116583
linux
upload_version_json

00:00:10