Merge pull request #12726 from owncloud/add-filter-for-backend-to-rest-index

author Morris Jobke <hey@morrisjobke.de>

Sat, 13 Dec 2014 07:50:15 +0000 (08:50 +0100)

committer Morris Jobke <hey@morrisjobke.de>

Sat, 13 Dec 2014 07:50:15 +0000 (08:50 +0100)
author Morris Jobke <hey@morrisjobke.de>
Sat, 13 Dec 2014 07:50:15 +0000 (08:50 +0100)
committer Morris Jobke <hey@morrisjobke.de>
Sat, 13 Dec 2014 07:50:15 +0000 (08:50 +0100)
diff --cc settings/controller/userscontroller.php
Simple merge
diff --cc tests/settings/controller/userscontrollertest.php
Simple merge
author	Morris Jobke <hey@morrisjobke.de>
	Sat, 13 Dec 2014 07:50:15 +0000 (08:50 +0100)
committer	Morris Jobke <hey@morrisjobke.de>
	Sat, 13 Dec 2014 07:50:15 +0000 (08:50 +0100)
		1	2
settings/controller/userscontroller.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/settings/controller/userscontrollertest.php	patch \|	diff1 \|	diff2 \|	blob \| history