Merge branch 'master' into 'master'

Update c101206060.lua

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

00:00:09

 
  Prepare2
passed #126836
linux
json

00:00:15

passed #126837
linux
json2

00:00:21

 
  Pack
passed #126838
linux
neos

00:00:13

passed #126839
linux
pack

00:00:08

passed #126840
linux
server

00:00:07

 
  Deploy
passed #126844
linux
deploy_to_koishi

00:00:16

passed #126843
linux
deploy_to_tiramisu

00:00:12

passed #126841
linux
upload_neos

00:00:05

passed #126842
linux
upload_version_json

00:00:09