Merge branch 'master' into glitch-soc/tentative-merge

Conflicts:
	README.md
	app/controllers/statuses_controller.rb
	app/lib/feed_manager.rb
	config/navigation.rb
	spec/lib/feed_manager_spec.rb

Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f52b.svg b/public/emoji/1f52b.svg
index fa4e11d88..3c8b6e43e 100644
--- a/public/emoji/1f52b.svg
+++ b/public/emoji/1f52b.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45 45" style="enable-background:new 0 0 45 45;" xml:space="preserve" version="1.1" id="svg2"><metadata id="metadata8"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/></cc:Work></rdf:RDF></metadata><defs id="defs6"><clipPath id="clipPath16" clipPathUnits="userSpaceOnUse"><path id="path18" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath></defs><g transform="matrix(1.25,0,0,-1.25,0,45)" id="g10"><g id="g12"><g clip-path="url(#clipPath16)" id="g14"><g transform="translate(19,14)" id="g20"><path id="path22" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -6,0 -5.127,6.449 -5,7 L 5,5 C 4.817,2.609 2.438,0 0,0 m 6,18 -11,0 c -1.104,0 -2,-0.895 -2,-2 l -6,0 c 0,1.105 -0.896,2 -2,2 l -1,0 c -1.104,0 -2,-0.895 -2,-2 l -1,0 0,-3 0,-2 c 0,-1.104 0.896,-2 2,-2 l 10,0 0,-1 0,-3 c 0,-3.865 3.134,-7 7,-7 3.581,0 6.585,2.53 7,6 l 1,0 c 1.105,0 2,0.896 2,2 l 0,8 c -2.209,0 -4,1.791 -4,4"/></g><g transform="translate(26,18)" id="g24"><path id="path26" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 3,5 c 0,0 5,0 6,-9 l 1,-6 c 0,0 0,-4 -4,-4 l -2,0 c -4,0 -4,4 -4,4 L 0,0 Z"/></g><g transform="translate(27,22)" id="g28"><path id="path30" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.104,0 -2,0.896 -2,2 -2,4.814 -0.136,9 5,9 6.105,9 7,8.105 7,7 7,5.896 6.105,5 5,5 2.145,5 2,2.501 2,2 2,0.896 1.105,0 0,0"/></g><g transform="translate(19,21)" id="g32"><path id="path34" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1 0,-3 -1,-4 -1,-1 2,-1 3,1 1,2 1,2 1,3 0,1 -3,0 -3,0"/></g><g transform="translate(25,26)" id="g36"><path id="path38" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -5.995,0 c -2.209,0 -2,1.791 -2,4 L -12,0 c 0,2.209 -0.204,4 2.005,4 L -4,4 C -1.791,4 0,2.209 0,0"/></g><g transform="translate(20,27)" id="g40"><path id="path42" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,0 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 L 0,2 C 0.553,2 1,1.552 1,1 1,0.448 0.553,0 0,0"/></g><g transform="translate(20,23)" id="g44"><path id="path46" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,0 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 L 0,2 C 0.553,2 1,1.552 1,1 1,0.448 0.553,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M16.61 17.589h5.278v1.056H16.61z"/><path fill="#FFAC33" d="M15.555 15.478c-.135 0-.27.052-.373.155-.206.206-.206.54 0 .746.845.844.845 2.631 0 3.476-.206.206-.206.54 0 .746.206.206.54.206.746 0 1.254-1.253 1.254-3.715 0-4.968-.103-.103-.238-.155-.373-.155z"/><path fill="#77B255" d="M23.888 23.486h-8.575c-1.873 0-3.261-.974-3.809-2.671l-2.405-6.601 2.114-.771 2.419 6.641c.255.788.8 1.151 1.681 1.151h8.575v2.251z"/><path fill="#3E721D" d="M35.205 11.222l-1.962.609-1.306-4.21 1.962-.609c.584-.181 1.211.148 1.392.733l.647 2.084c.181.585-.148 1.212-.733 1.393z"/><path fill="#E95F28" d="M1.687 6.947h1.761v5.024H1.686c-.87 0-1.582-.712-1.582-1.582v-1.86c0-.87.712-1.582 1.583-1.582z"/><path fill="#3E721D" d="M6.694 4.89c0 .923.748 1.671 1.671 1.671s2.727-.748 2.727-1.671-1.804-1.671-2.727-1.671-1.671.748-1.671 1.671z"/><path fill="#5C913B" d="M4.869 12.905c0 1.166.945 2.111 2.659 2.111H22v-2.111H4.869z"/><path fill="#77B255" d="M35.279 29.382s-1.975-6.154-2.731-8.768-1.006-4.614 1.077-6.147c1.135-.835 1.431-1.844 1.204-2.899-.377-1.752-1.284-4.076-1.72-4.925-.189-.369-.486-.758-1.073-.928 0 0-3.915-1.737-15.24-1.737-6.333 0-14.215.957-14.215 3.265v3.612c0 1.23.997 2.227 2.227 2.227H18.51c.727 0 1.37.473 1.587 1.168l4.352 13.79v.001c.429 1.402-.915 1.633-.915 2.787 0 .714.584 1.297 1.297 1.297h8.433c1.425 0 2.441-1.383 2.015-2.743z"/><path fill="#A6D388" d="M27.499 21.008c-.444 0-.851-.299-.967-.749-1.357-5.237-4.091-8.438-8.354-9.786-6.075-1.921-13.393-.323-13.466-.308-.539.12-1.074-.219-1.194-.758-.121-.538.217-1.073.756-1.194.32-.072 7.909-1.733 14.506.352 4.905 1.55 8.165 5.316 9.688 11.191.139.535-.183 1.08-.717 1.219-.084.023-.169.033-.252.033z"/><circle fill="#F5F8FA" cx="29.185" cy="10.67" r="3.305"/><circle fill="#FFCC4D" cx="29.185" cy="10.67" r="2.292"/></svg>
\ No newline at end of file