Merge remote-tracking branch 'origin/master' into merge-upstream

author David Yip <yipdw@member.fsf.org>

Wed, 27 Dec 2017 04:24:19 +0000 (22:24 -0600)

committer David Yip <yipdw@member.fsf.org>

Wed, 27 Dec 2017 04:24:19 +0000 (22:24 -0600)
author David Yip <yipdw@member.fsf.org>
Wed, 27 Dec 2017 04:24:19 +0000 (22:24 -0600)
committer David Yip <yipdw@member.fsf.org>
Wed, 27 Dec 2017 04:24:19 +0000 (22:24 -0600)
diff --cc app/javascript/images/mastodon-drawer.png

index 8fe0df76aa0e7b5a819ca6273051a7aff129fc43,a1fb642a003b2e2b652b1e6022a84f08dc76105f..8fe0df76aa0e7b5a819ca6273051a7aff129fc43

Binary files differ
diff --cc app/javascript/styles/mastodon/components.scss
Simple merge
author	David Yip <yipdw@member.fsf.org>
	Wed, 27 Dec 2017 04:24:19 +0000 (22:24 -0600)
committer	David Yip <yipdw@member.fsf.org>
	Wed, 27 Dec 2017 04:24:19 +0000 (22:24 -0600)
		1	2
app/javascript/images/mastodon-drawer.png	patch \|	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/mastodon/components.scss	patch \|	diff1 \|	diff2 \|	blob \| history