Merge pull request #8931 from owncloud/filelist-usepathforaction

author Vincent Petry <pvince81@owncloud.com>

Mon, 23 Jun 2014 13:53:23 +0000 (15:53 +0200)

committer Vincent Petry <pvince81@owncloud.com>

Mon, 23 Jun 2014 13:53:23 +0000 (15:53 +0200)
author Vincent Petry <pvince81@owncloud.com>
Mon, 23 Jun 2014 13:53:23 +0000 (15:53 +0200)
committer Vincent Petry <pvince81@owncloud.com>
Mon, 23 Jun 2014 13:53:23 +0000 (15:53 +0200)
diff --cc apps/files/js/fileactions.js
Simple merge
diff --cc apps/files/js/filelist.js
Simple merge
diff --cc apps/files/tests/js/filelistSpec.js
Simple merge
author	Vincent Petry <pvince81@owncloud.com>
	Mon, 23 Jun 2014 13:53:23 +0000 (15:53 +0200)
committer	Vincent Petry <pvince81@owncloud.com>
	Mon, 23 Jun 2014 13:53:23 +0000 (15:53 +0200)
		1	2
apps/files/js/fileactions.js	patch \|	diff1 \|	diff2 \|	blob \| history
apps/files/js/filelist.js	patch \|	diff1 \|	diff2 \|	blob \| history
apps/files/tests/js/filelistSpec.js	patch \|	diff1 \|	diff2 \|	blob \| history