Merge pull request #35742 from nextcloud/backport/35714/stable25

author Pytal <24800714+Pytal@users.noreply.github.com>

Tue, 13 Dec 2022 22:38:31 +0000 (14:38 -0800)

committer GitHub <noreply@github.com>

Tue, 13 Dec 2022 22:38:31 +0000 (14:38 -0800)
author Pytal <24800714+Pytal@users.noreply.github.com>
Tue, 13 Dec 2022 22:38:31 +0000 (14:38 -0800)
committer GitHub <noreply@github.com>
Tue, 13 Dec 2022 22:38:31 +0000 (14:38 -0800)
diff --cc core/css/inputs.css
Simple merge
diff --cc core/css/inputs.scss
Simple merge
diff --cc core/css/server.css
Simple merge
author	Pytal <24800714+Pytal@users.noreply.github.com>
	Tue, 13 Dec 2022 22:38:31 +0000 (14:38 -0800)
committer	GitHub <noreply@github.com>
	Tue, 13 Dec 2022 22:38:31 +0000 (14:38 -0800)
		1	2
core/css/inputs.css	patch \|	diff1 \|	diff2 \|	blob \| history
core/css/inputs.scss	patch \|	diff1 \|	diff2 \|	blob \| history
core/css/server.css	patch \|	diff1 \|	diff2 \|	blob \| history