Merge pull request #7011 from owncloud/jshint

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

Tue, 4 Feb 2014 20:11:32 +0000 (12:11 -0800)

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

Tue, 4 Feb 2014 20:11:32 +0000 (12:11 -0800)
author Thomas Müller <thomas.mueller@tmit.eu>
Tue, 4 Feb 2014 20:11:32 +0000 (12:11 -0800)
committer Thomas Müller <thomas.mueller@tmit.eu>
Tue, 4 Feb 2014 20:11:32 +0000 (12:11 -0800)
diff --cc apps/files/js/file-upload.js
Simple merge
diff --cc apps/files/js/fileactions.js
Simple merge
diff --cc apps/files/js/filelist.js
Simple merge
diff --cc apps/files/js/files.js
Simple merge
diff --cc apps/files/tests/js/fileactionsSpec.js
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Tue, 4 Feb 2014 20:11:32 +0000 (12:11 -0800)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Tue, 4 Feb 2014 20:11:32 +0000 (12:11 -0800)
		1	2
apps/files/js/file-upload.js	patch \|	diff1 \|	diff2 \|	blob \| history
apps/files/js/fileactions.js	patch \|	diff1 \|	diff2 \|	blob \| history
apps/files/js/filelist.js	patch \|	diff1 \|	diff2 \|	blob \| history
apps/files/js/files.js	patch \|	diff1 \|	diff2 \|	blob \| history
apps/files/tests/js/fileactionsSpec.js	patch \|	diff1 \|	diff2 \|	blob \| history