Merge branch 'release/4.0.0' into develop

author Chocobozzz <me@florianbigard.com>

Tue, 7 Dec 2021 10:06:57 +0000 (11:06 +0100)

committer Chocobozzz <me@florianbigard.com>

Tue, 7 Dec 2021 10:06:57 +0000 (11:06 +0100)
author Chocobozzz <me@florianbigard.com>
Tue, 7 Dec 2021 10:06:57 +0000 (11:06 +0100)
committer Chocobozzz <me@florianbigard.com>
Tue, 7 Dec 2021 10:06:57 +0000 (11:06 +0100)
diff --cc client/src/app/+accounts/accounts.component.html
Simple merge
diff --cc client/src/app/+accounts/accounts.component.ts
Simple merge
author	Chocobozzz <me@florianbigard.com>
	Tue, 7 Dec 2021 10:06:57 +0000 (11:06 +0100)
committer	Chocobozzz <me@florianbigard.com>
	Tue, 7 Dec 2021 10:06:57 +0000 (11:06 +0100)
		1	2
client/src/app/+accounts/accounts.component.html	patch \|	diff1 \|	diff2 \|	blob \| history
client/src/app/+accounts/accounts.component.ts	patch \|	diff1 \|	diff2 \|	blob \| history