Merge pull request #4825 from nextcloud/add-timeout-appstore

author Lukas Reschke <lukas@statuscode.ch>

Fri, 12 May 2017 10:37:18 +0000 (12:37 +0200)

committer GitHub <noreply@github.com>

Fri, 12 May 2017 10:37:18 +0000 (12:37 +0200)
author Lukas Reschke <lukas@statuscode.ch>
Fri, 12 May 2017 10:37:18 +0000 (12:37 +0200)
committer GitHub <noreply@github.com>
Fri, 12 May 2017 10:37:18 +0000 (12:37 +0200)
diff --cc lib/private/App/AppStore/Fetcher/Fetcher.php
Simple merge
diff --cc tests/lib/App/AppStore/Fetcher/FetcherBase.php
Simple merge
author	Lukas Reschke <lukas@statuscode.ch>
	Fri, 12 May 2017 10:37:18 +0000 (12:37 +0200)
committer	GitHub <noreply@github.com>
	Fri, 12 May 2017 10:37:18 +0000 (12:37 +0200)
		1	2
lib/private/App/AppStore/Fetcher/Fetcher.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/lib/App/AppStore/Fetcher/FetcherBase.php	patch \|	diff1 \|	diff2 \|	blob \| history