Merge branch 'patch-1' into 'master'

fix The League of Uniform Nomenclature Strikes

See merge request !86
10 jobs for master in 2 minutes and 52 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Prepare
passed #131135
linux
merge_databases

00:00:10

 
  Prepare2
passed #131136
linux
json

00:00:14

passed #131137
linux
json2

00:00:13

 
  Pack
passed #131138
linux
neos

00:01:59

passed #131139
linux
pack

00:01:54

passed #131140
linux
server

00:01:50

 
  Deploy
passed #131144
linux
deploy_to_koishi

00:00:27

passed #131143
linux
deploy_to_tiramisu

00:00:27

passed #131141
linux
upload_neos

00:00:13

passed #131142
linux
upload_version_json

00:00:13