Merge branch 'release/4.2.0' into develop

author Chocobozzz <me@florianbigard.com>

Fri, 3 Jun 2022 12:32:44 +0000 (14:32 +0200)

committer Chocobozzz <me@florianbigard.com>

Fri, 3 Jun 2022 12:32:44 +0000 (14:32 +0200)
author Chocobozzz <me@florianbigard.com>
Fri, 3 Jun 2022 12:32:44 +0000 (14:32 +0200)
committer Chocobozzz <me@florianbigard.com>
Fri, 3 Jun 2022 12:32:44 +0000 (14:32 +0200)
diff --cc CHANGELOG.md
Simple merge
diff --cc config/default.yaml
Simple merge
diff --cc config/production.yaml.example
Simple merge
author	Chocobozzz <me@florianbigard.com>
	Fri, 3 Jun 2022 12:32:44 +0000 (14:32 +0200)
committer	Chocobozzz <me@florianbigard.com>
	Fri, 3 Jun 2022 12:32:44 +0000 (14:32 +0200)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
config/default.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
config/production.yaml.example	patch \|	diff1 \|	diff2 \|	blob \| history