Merge pull request #3360 from nextcloud/dav-search

author Robin Appelman <robin@icewind.nl>

Wed, 8 Mar 2017 12:09:19 +0000 (13:09 +0100)

committer GitHub <noreply@github.com>

Wed, 8 Mar 2017 12:09:19 +0000 (13:09 +0100)
author Robin Appelman <robin@icewind.nl>
Wed, 8 Mar 2017 12:09:19 +0000 (13:09 +0100)
committer GitHub <noreply@github.com>
Wed, 8 Mar 2017 12:09:19 +0000 (13:09 +0100)
diff --cc apps/dav/lib/Server.php
Simple merge
diff --cc lib/composer/composer/autoload_classmap.php
Simple merge
diff --cc lib/composer/composer/autoload_static.php
Simple merge
author	Robin Appelman <robin@icewind.nl>
	Wed, 8 Mar 2017 12:09:19 +0000 (13:09 +0100)
committer	GitHub <noreply@github.com>
	Wed, 8 Mar 2017 12:09:19 +0000 (13:09 +0100)
		1	2
apps/dav/lib/Server.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/composer/composer/autoload_classmap.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/composer/composer/autoload_static.php	patch \|	diff1 \|	diff2 \|	blob \| history