Merge pull request #22854 from nextcloud/bugfix/noid/unified-search

author Roeland Jago Douma <rullzer@users.noreply.github.com>

Tue, 15 Sep 2020 09:35:28 +0000 (11:35 +0200)

committer GitHub <noreply@github.com>

Tue, 15 Sep 2020 09:35:28 +0000 (11:35 +0200)
author Roeland Jago Douma <rullzer@users.noreply.github.com>
Tue, 15 Sep 2020 09:35:28 +0000 (11:35 +0200)
committer GitHub <noreply@github.com>
Tue, 15 Sep 2020 09:35:28 +0000 (11:35 +0200)
diff --cc apps/files/lib/Search/FilesSearchProvider.php
Simple merge
author	Roeland Jago Douma <rullzer@users.noreply.github.com>
	Tue, 15 Sep 2020 09:35:28 +0000 (11:35 +0200)
committer	GitHub <noreply@github.com>
	Tue, 15 Sep 2020 09:35:28 +0000 (11:35 +0200)