Merge branch 'release/4.2.0' into develop

author Chocobozzz <me@florianbigard.com>

Tue, 28 Jun 2022 12:37:30 +0000 (14:37 +0200)

committer Chocobozzz <me@florianbigard.com>

Tue, 28 Jun 2022 12:37:30 +0000 (14:37 +0200)
author Chocobozzz <me@florianbigard.com>
Tue, 28 Jun 2022 12:37:30 +0000 (14:37 +0200)
committer Chocobozzz <me@florianbigard.com>
Tue, 28 Jun 2022 12:37:30 +0000 (14:37 +0200)
diff --cc CHANGELOG.md
Simple merge
diff --cc client/package.json
Simple merge
diff --cc package.json
Simple merge
author	Chocobozzz <me@florianbigard.com>
	Tue, 28 Jun 2022 12:37:30 +0000 (14:37 +0200)
committer	Chocobozzz <me@florianbigard.com>
	Tue, 28 Jun 2022 12:37:30 +0000 (14:37 +0200)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
client/package.json	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history