Merge branch 'next' into develop

author Chocobozzz <me@florianbigard.com>

Mon, 11 Oct 2021 07:37:30 +0000 (09:37 +0200)

committer Chocobozzz <me@florianbigard.com>

Mon, 11 Oct 2021 07:37:30 +0000 (09:37 +0200)
author Chocobozzz <me@florianbigard.com>
Mon, 11 Oct 2021 07:37:30 +0000 (09:37 +0200)
committer Chocobozzz <me@florianbigard.com>
Mon, 11 Oct 2021 07:37:30 +0000 (09:37 +0200)
diff --cc client/package.json
Simple merge
diff --cc client/src/standalone/videos/test-embed.ts
Simple merge
diff --cc package.json
Simple merge
author	Chocobozzz <me@florianbigard.com>
	Mon, 11 Oct 2021 07:37:30 +0000 (09:37 +0200)
committer	Chocobozzz <me@florianbigard.com>
	Mon, 11 Oct 2021 07:37:30 +0000 (09:37 +0200)
		1	2
client/package.json	patch \|	diff1 \|	diff2 \|	blob \| history
client/src/standalone/videos/test-embed.ts	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history