Merge pull request #3249 from nextcloud/add-clear-search-button

author Morris Jobke <hey@morrisjobke.de>

Thu, 26 Jan 2017 21:42:52 +0000 (15:42 -0600)

committer GitHub <noreply@github.com>

Thu, 26 Jan 2017 21:42:52 +0000 (15:42 -0600)
author Morris Jobke <hey@morrisjobke.de>
Thu, 26 Jan 2017 21:42:52 +0000 (15:42 -0600)
committer GitHub <noreply@github.com>
Thu, 26 Jan 2017 21:42:52 +0000 (15:42 -0600)
diff --cc core/css/icons.scss
Simple merge
diff --cc core/css/styles.scss
Simple merge
author	Morris Jobke <hey@morrisjobke.de>
	Thu, 26 Jan 2017 21:42:52 +0000 (15:42 -0600)
committer	GitHub <noreply@github.com>
	Thu, 26 Jan 2017 21:42:52 +0000 (15:42 -0600)
		1	2
core/css/icons.scss	patch \|	diff1 \|	diff2 \|	blob \| history
core/css/styles.scss	patch \|	diff1 \|	diff2 \|	blob \| history