Merge pull request #229 from glitch-soc/glitch-theme

author beatrix <beatrix.bitrot@gmail.com>

Wed, 6 Dec 2017 22:44:07 +0000 (17:44 -0500)

committer GitHub <noreply@github.com>

Wed, 6 Dec 2017 22:44:07 +0000 (17:44 -0500)
author beatrix <beatrix.bitrot@gmail.com>
Wed, 6 Dec 2017 22:44:07 +0000 (17:44 -0500)
committer GitHub <noreply@github.com>
Wed, 6 Dec 2017 22:44:07 +0000 (17:44 -0500)
diff --cc app/javascript/styles/mastodon/components.scss
Simple merge
author	beatrix <beatrix.bitrot@gmail.com>
	Wed, 6 Dec 2017 22:44:07 +0000 (17:44 -0500)
committer	GitHub <noreply@github.com>
	Wed, 6 Dec 2017 22:44:07 +0000 (17:44 -0500)