Merge pull request #21392 from owncloud/files_external-import

author Thomas Müller <thomas.mueller@tmit.eu>

Wed, 13 Jan 2016 09:35:10 +0000 (10:35 +0100)

committer Thomas Müller <thomas.mueller@tmit.eu>

Wed, 13 Jan 2016 09:35:10 +0000 (10:35 +0100)
author Thomas Müller <thomas.mueller@tmit.eu>
Wed, 13 Jan 2016 09:35:10 +0000 (10:35 +0100)
committer Thomas Müller <thomas.mueller@tmit.eu>
Wed, 13 Jan 2016 09:35:10 +0000 (10:35 +0100)
diff --cc apps/files_external/appinfo/register_command.php
Simple merge
diff --cc apps/files_external/command/listcommand.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Wed, 13 Jan 2016 09:35:10 +0000 (10:35 +0100)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Wed, 13 Jan 2016 09:35:10 +0000 (10:35 +0100)
		1	2
apps/files_external/appinfo/register_command.php	patch \|	diff1 \|	diff2 \|	blob \| history
apps/files_external/command/listcommand.php	patch \|	diff1 \|	diff2 \|	blob \| history