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

author Eugen Rochko <eugen@zeonfederated.com>

Tue, 11 Apr 2017 18:43:56 +0000 (20:43 +0200)

committer Eugen Rochko <eugen@zeonfederated.com>

Tue, 11 Apr 2017 18:43:56 +0000 (20:43 +0200)
author Eugen Rochko <eugen@zeonfederated.com>
Tue, 11 Apr 2017 18:43:56 +0000 (20:43 +0200)
committer Eugen Rochko <eugen@zeonfederated.com>
Tue, 11 Apr 2017 18:43:56 +0000 (20:43 +0200)
diff --cc app/assets/javascripts/components/components/status.jsx
Simple merge
diff --cc app/assets/stylesheets/components.scss
Simple merge
diff --cc config/settings.yml
Simple merge
author	Eugen Rochko <eugen@zeonfederated.com>
	Tue, 11 Apr 2017 18:43:56 +0000 (20:43 +0200)
committer	Eugen Rochko <eugen@zeonfederated.com>
	Tue, 11 Apr 2017 18:43:56 +0000 (20:43 +0200)
		1	2
app/assets/javascripts/components/components/status.jsx	patch \|	diff1 \|	diff2 \|	blob \| history
app/assets/stylesheets/components.scss	patch \|	diff1 \|	diff2 \|	blob \| history
config/settings.yml	patch \|	diff1 \|	diff2 \|	blob \| history