Merge pull request #34485 from michaelkuhn/hasBigIntConversionPendingColumns-files_trash

author Robin Appelman <robin@icewind.nl>

Fri, 11 Nov 2022 16:09:26 +0000 (17:09 +0100)

committer GitHub <noreply@github.com>

Fri, 11 Nov 2022 16:09:26 +0000 (17:09 +0100)
author Robin Appelman <robin@icewind.nl>
Fri, 11 Nov 2022 16:09:26 +0000 (17:09 +0100)
committer GitHub <noreply@github.com>
Fri, 11 Nov 2022 16:09:26 +0000 (17:09 +0100)
diff --cc apps/settings/lib/Controller/CheckSetupController.php
Simple merge
author	Robin Appelman <robin@icewind.nl>
	Fri, 11 Nov 2022 16:09:26 +0000 (17:09 +0100)
committer	GitHub <noreply@github.com>
	Fri, 11 Nov 2022 16:09:26 +0000 (17:09 +0100)