Merge pull request #1641 from nextcloud/log-in-button

author Jan-Christoph Borchardt <hey@jancborchardt.net>

Mon, 17 Oct 2016 16:28:27 +0000 (18:28 +0200)

committer GitHub <noreply@github.com>

Mon, 17 Oct 2016 16:28:27 +0000 (18:28 +0200)
author Jan-Christoph Borchardt <hey@jancborchardt.net>
Mon, 17 Oct 2016 16:28:27 +0000 (18:28 +0200)
committer GitHub <noreply@github.com>
Mon, 17 Oct 2016 16:28:27 +0000 (18:28 +0200)
diff --cc core/css/icons.css
Simple merge
diff --cc core/css/styles.css
Simple merge
author	Jan-Christoph Borchardt <hey@jancborchardt.net>
	Mon, 17 Oct 2016 16:28:27 +0000 (18:28 +0200)
committer	GitHub <noreply@github.com>
	Mon, 17 Oct 2016 16:28:27 +0000 (18:28 +0200)
		1	2
core/css/icons.css	patch \|	diff1 \|	diff2 \|	blob \| history
core/css/styles.css	patch \|	diff1 \|	diff2 \|	blob \| history