Merge pull request #14925 from owncloud/ext-mountoptions-ui

author Robin McCorkell <rmccorkell@karoshi.org.uk>

Thu, 26 Mar 2015 21:36:34 +0000 (21:36 +0000)

committer Robin McCorkell <rmccorkell@karoshi.org.uk>

Thu, 26 Mar 2015 21:36:34 +0000 (21:36 +0000)
author Robin McCorkell <rmccorkell@karoshi.org.uk>
Thu, 26 Mar 2015 21:36:34 +0000 (21:36 +0000)
committer Robin McCorkell <rmccorkell@karoshi.org.uk>
Thu, 26 Mar 2015 21:36:34 +0000 (21:36 +0000)
diff --cc apps/files_external/lib/config.php
Simple merge
diff --cc apps/files_external/tests/mountconfig.php
Simple merge
diff --cc lib/private/files/storage/common.php
Simple merge
author	Robin McCorkell <rmccorkell@karoshi.org.uk>
	Thu, 26 Mar 2015 21:36:34 +0000 (21:36 +0000)
committer	Robin McCorkell <rmccorkell@karoshi.org.uk>
	Thu, 26 Mar 2015 21:36:34 +0000 (21:36 +0000)
		1	2
apps/files_external/lib/config.php	patch \|	diff1 \|	diff2 \|	blob \| history
apps/files_external/tests/mountconfig.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/files/storage/common.php	patch \|	diff1 \|	diff2 \|	blob \| history