Merge pull request #7257 from owncloud/filelist-fileinfo

author Vincent Petry <pvince81@owncloud.com>

Wed, 19 Feb 2014 08:40:11 +0000 (09:40 +0100)

committer Vincent Petry <pvince81@owncloud.com>

Wed, 19 Feb 2014 08:40:11 +0000 (09:40 +0100)
author Vincent Petry <pvince81@owncloud.com>
Wed, 19 Feb 2014 08:40:11 +0000 (09:40 +0100)
committer Vincent Petry <pvince81@owncloud.com>
Wed, 19 Feb 2014 08:40:11 +0000 (09:40 +0100)
diff --cc apps/files/index.php
Simple merge
diff --cc lib/private/files/filesystem.php
Simple merge
author	Vincent Petry <pvince81@owncloud.com>
	Wed, 19 Feb 2014 08:40:11 +0000 (09:40 +0100)
committer	Vincent Petry <pvince81@owncloud.com>
	Wed, 19 Feb 2014 08:40:11 +0000 (09:40 +0100)
		1	2
apps/files/index.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/files/filesystem.php	patch \|	diff1 \|	diff2 \|	blob \| history