Merge pull request #2342 from nextcloud/filepicker-shadow

author Lukas Reschke <lukas@statuscode.ch>

Mon, 28 Nov 2016 14:00:19 +0000 (15:00 +0100)

committer GitHub <noreply@github.com>

Mon, 28 Nov 2016 14:00:19 +0000 (15:00 +0100)
author Lukas Reschke <lukas@statuscode.ch>
Mon, 28 Nov 2016 14:00:19 +0000 (15:00 +0100)
committer GitHub <noreply@github.com>
Mon, 28 Nov 2016 14:00:19 +0000 (15:00 +0100)
diff --cc core/css/styles.css
Simple merge
diff --cc core/js/oc-dialogs.js
Simple merge
author	Lukas Reschke <lukas@statuscode.ch>
	Mon, 28 Nov 2016 14:00:19 +0000 (15:00 +0100)
committer	GitHub <noreply@github.com>
	Mon, 28 Nov 2016 14:00:19 +0000 (15:00 +0100)
		1	2
core/css/styles.css	patch \|	diff1 \|	diff2 \|	blob \| history
core/js/oc-dialogs.js	patch \|	diff1 \|	diff2 \|	blob \| history