Merge branch 'release/3.3.0' into develop

author Chocobozzz <me@florianbigard.com>

Fri, 30 Jul 2021 09:38:19 +0000 (11:38 +0200)

committer Chocobozzz <me@florianbigard.com>

Fri, 30 Jul 2021 09:38:19 +0000 (11:38 +0200)
author Chocobozzz <me@florianbigard.com>
Fri, 30 Jul 2021 09:38:19 +0000 (11:38 +0200)
committer Chocobozzz <me@florianbigard.com>
Fri, 30 Jul 2021 09:38:19 +0000 (11:38 +0200)
diff --cc client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
Simple merge
author	Chocobozzz <me@florianbigard.com>
	Fri, 30 Jul 2021 09:38:19 +0000 (11:38 +0200)
committer	Chocobozzz <me@florianbigard.com>
	Fri, 30 Jul 2021 09:38:19 +0000 (11:38 +0200)