Merge pull request #12795 from owncloud/files-layoutchanges

author Morris Jobke <hey@morrisjobke.de>

Sat, 13 Dec 2014 08:00:43 +0000 (09:00 +0100)

committer Morris Jobke <hey@morrisjobke.de>

Sat, 13 Dec 2014 08:00:43 +0000 (09:00 +0100)
author Morris Jobke <hey@morrisjobke.de>
Sat, 13 Dec 2014 08:00:43 +0000 (09:00 +0100)
committer Morris Jobke <hey@morrisjobke.de>
Sat, 13 Dec 2014 08:00:43 +0000 (09:00 +0100)
diff --cc apps/files/js/filelist.js
Simple merge
diff --cc apps/files_sharing/js/sharedfilelist.js
Simple merge
diff --cc apps/files_sharing/tests/js/shareSpec.js
Simple merge
author	Morris Jobke <hey@morrisjobke.de>
	Sat, 13 Dec 2014 08:00:43 +0000 (09:00 +0100)
committer	Morris Jobke <hey@morrisjobke.de>
	Sat, 13 Dec 2014 08:00:43 +0000 (09:00 +0100)
		1	2
apps/files/js/filelist.js	patch \|	diff1 \|	diff2 \|	blob \| history
apps/files_sharing/js/sharedfilelist.js	patch \|	diff1 \|	diff2 \|	blob \| history
apps/files_sharing/tests/js/shareSpec.js	patch \|	diff1 \|	diff2 \|	blob \| history