Merge branch 'release/3.2.0' into develop

author Chocobozzz <me@florianbigard.com>

Wed, 26 May 2021 13:38:44 +0000 (15:38 +0200)

committer Chocobozzz <me@florianbigard.com>

Wed, 26 May 2021 13:38:44 +0000 (15:38 +0200)
author Chocobozzz <me@florianbigard.com>
Wed, 26 May 2021 13:38:44 +0000 (15:38 +0200)
committer Chocobozzz <me@florianbigard.com>
Wed, 26 May 2021 13:38:44 +0000 (15:38 +0200)
diff --cc server/models/redundancy/video-redundancy.ts
Simple merge
author	Chocobozzz <me@florianbigard.com>
	Wed, 26 May 2021 13:38:44 +0000 (15:38 +0200)
committer	Chocobozzz <me@florianbigard.com>
	Wed, 26 May 2021 13:38:44 +0000 (15:38 +0200)