Merge pull request #25136 from nextcloud/cachejail-search-filter

author Vincent Petry <vincent@nextcloud.com>

Mon, 15 Mar 2021 16:45:30 +0000 (17:45 +0100)

committer GitHub <noreply@github.com>

Mon, 15 Mar 2021 16:45:30 +0000 (17:45 +0100)
author Vincent Petry <vincent@nextcloud.com>
Mon, 15 Mar 2021 16:45:30 +0000 (17:45 +0100)
committer GitHub <noreply@github.com>
Mon, 15 Mar 2021 16:45:30 +0000 (17:45 +0100)
diff --cc apps/files_sharing/tests/CacheTest.php
Simple merge
diff --cc lib/private/Files/Cache/QuerySearchHelper.php
Simple merge
author	Vincent Petry <vincent@nextcloud.com>
	Mon, 15 Mar 2021 16:45:30 +0000 (17:45 +0100)
committer	GitHub <noreply@github.com>
	Mon, 15 Mar 2021 16:45:30 +0000 (17:45 +0100)
		1	2
apps/files_sharing/tests/CacheTest.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/Files/Cache/QuerySearchHelper.php	patch \|	diff1 \|	diff2 \|	blob \| history