Merge pull request #529 from nextcloud/vendor-maintenance-downgrade

author Lukas Reschke <lukas@statuscode.ch>

Tue, 9 Aug 2016 22:25:53 +0000 (00:25 +0200)

committer GitHub <noreply@github.com>

Tue, 9 Aug 2016 22:25:53 +0000 (00:25 +0200)
author Lukas Reschke <lukas@statuscode.ch>
Tue, 9 Aug 2016 22:25:53 +0000 (00:25 +0200)
committer GitHub <noreply@github.com>
Tue, 9 Aug 2016 22:25:53 +0000 (00:25 +0200)
diff --cc lib/private/legacy/app.php
Simple merge
diff --cc version.php
Simple merge
author	Lukas Reschke <lukas@statuscode.ch>
	Tue, 9 Aug 2016 22:25:53 +0000 (00:25 +0200)
committer	GitHub <noreply@github.com>
	Tue, 9 Aug 2016 22:25:53 +0000 (00:25 +0200)
		1	2
lib/private/legacy/app.php	patch \|	diff1 \|	diff2 \|	blob \| history
version.php	patch \|	diff1 \|	diff2 \|	blob \| history