Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown

author Eugen Rochko <eugen@zeonfederated.com>

Mon, 9 Jan 2017 13:10:32 +0000 (14:10 +0100)

committer Eugen Rochko <eugen@zeonfederated.com>

Mon, 9 Jan 2017 13:10:32 +0000 (14:10 +0100)
author Eugen Rochko <eugen@zeonfederated.com>
Mon, 9 Jan 2017 13:10:32 +0000 (14:10 +0100)
committer Eugen Rochko <eugen@zeonfederated.com>
Mon, 9 Jan 2017 13:10:32 +0000 (14:10 +0100)
diff --cc app/assets/javascripts/components/components/status_action_bar.jsx
Simple merge
author	Eugen Rochko <eugen@zeonfederated.com>
	Mon, 9 Jan 2017 13:10:32 +0000 (14:10 +0100)
committer	Eugen Rochko <eugen@zeonfederated.com>
	Mon, 9 Jan 2017 13:10:32 +0000 (14:10 +0100)