Merge pull request #20150 from pellaeon/pr-droppable-hover-visual-cue

author Vincent Petry <pvince81@owncloud.com>

Mon, 30 May 2016 14:03:36 +0000 (16:03 +0200)

committer Vincent Petry <pvince81@owncloud.com>

Mon, 30 May 2016 14:03:36 +0000 (16:03 +0200)
author Vincent Petry <pvince81@owncloud.com>
Mon, 30 May 2016 14:03:36 +0000 (16:03 +0200)
committer Vincent Petry <pvince81@owncloud.com>
Mon, 30 May 2016 14:03:36 +0000 (16:03 +0200)
diff --cc apps/files/js/filelist.js
Simple merge
diff --cc core/css/styles.css
Simple merge
author	Vincent Petry <pvince81@owncloud.com>
	Mon, 30 May 2016 14:03:36 +0000 (16:03 +0200)
committer	Vincent Petry <pvince81@owncloud.com>
	Mon, 30 May 2016 14:03:36 +0000 (16:03 +0200)
		1	2
apps/files/js/filelist.js	patch \|	diff1 \|	diff2 \|	blob \| history
core/css/styles.css	patch \|	diff1 \|	diff2 \|	blob \| history