Merge branch 'release/5.1.0' into develop

author Chocobozzz <me@florianbigard.com>

Thu, 16 Mar 2023 13:24:50 +0000 (14:24 +0100)

committer Chocobozzz <me@florianbigard.com>

Thu, 16 Mar 2023 13:24:50 +0000 (14:24 +0100)
author Chocobozzz <me@florianbigard.com>
Thu, 16 Mar 2023 13:24:50 +0000 (14:24 +0100)
committer Chocobozzz <me@florianbigard.com>
Thu, 16 Mar 2023 13:24:50 +0000 (14:24 +0100)
diff --cc client/src/sass/include/_mixins.scss
Simple merge
diff --cc client/src/sass/ng-select.scss
Simple merge
diff --cc server/tests/fixtures/peertube-plugin-test/main.js
Simple merge
author	Chocobozzz <me@florianbigard.com>
	Thu, 16 Mar 2023 13:24:50 +0000 (14:24 +0100)
committer	Chocobozzz <me@florianbigard.com>
	Thu, 16 Mar 2023 13:24:50 +0000 (14:24 +0100)
		1	2
client/src/sass/include/_mixins.scss	patch \|	diff1 \|	diff2 \|	blob \| history
client/src/sass/ng-select.scss	patch \|	diff1 \|	diff2 \|	blob \| history
server/tests/fixtures/peertube-plugin-test/main.js	patch \|	diff1 \|	diff2 \|	blob \| history