Merge pull request #15196 from owncloud/limit-file-activities-to-favorites

author Morris Jobke <hey@morrisjobke.de>

Wed, 8 Apr 2015 22:18:31 +0000 (00:18 +0200)

committer Morris Jobke <hey@morrisjobke.de>

Wed, 8 Apr 2015 22:18:31 +0000 (00:18 +0200)
author Morris Jobke <hey@morrisjobke.de>
Wed, 8 Apr 2015 22:18:31 +0000 (00:18 +0200)
committer Morris Jobke <hey@morrisjobke.de>
Wed, 8 Apr 2015 22:18:31 +0000 (00:18 +0200)
diff --cc lib/private/server.php
Simple merge
diff --cc lib/public/iservercontainer.php
Simple merge
author	Morris Jobke <hey@morrisjobke.de>
	Wed, 8 Apr 2015 22:18:31 +0000 (00:18 +0200)
committer	Morris Jobke <hey@morrisjobke.de>
	Wed, 8 Apr 2015 22:18:31 +0000 (00:18 +0200)
		1	2
lib/private/server.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/public/iservercontainer.php	patch \|	diff1 \|	diff2 \|	blob \| history