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/1f646-1f3fc-200d-2640-fe0f.svg b/public/emoji/1f646-1f3fc-200d-2640-fe0f.svg
index 271cf8fd0..439f4d81f 100644
--- a/public/emoji/1f646-1f3fc-200d-2640-fe0f.svg
+++ b/public/emoji/1f646-1f3fc-200d-2640-fe0f.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,36)" id="g20"><path id="path22" style="fill:#ffe51e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.721,0 -3.343,-0.406 -4.794,-1.111 -5.186,-1.042 -5.588,-1 -6,-1 c -3.866,0 -7,-3.134 -7,-7 l 0,-12 0.018,0 c 0.183,-6.467 5.471,-11.656 11.982,-11.656 6.511,0 11.799,5.189 11.982,11.656 l 0.018,0 0,9 C 11,-4.925 6.075,0 0,0"/></g><g transform="translate(27,9)" id="g24"><path id="path26" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,0 -16,0 -1,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-5 5,0 16,0 5,0 0,5 C 4,-1.791 2.209,0 0,0"/></g><path id="path28" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27,0 -1,0 0,4 1,0 0,-4 z"/><path id="path30" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 10,0 9,0 9,4 10,4 10,0 Z"/><g transform="translate(15,12)" id="g32"><path id="path34" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-4 c 0,-1.657 1.343,-3 3,-3 1.657,0 3,1.343 3,3 L 6,0 0,0 Z"/></g><g transform="translate(14,31)" id="g36"><path id="path38" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -0.003,-5.308 -5,-5.936 L -5,-12 c 0,-4.971 4.029,-9 9,-9 4.971,0 9,4.029 9,9 l 0,5.019 C 1.89,-6.605 0,0 0,0"/></g><g transform="translate(22,15)" id="g40"><path id="path42" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4,0 -4,0 c 0,0 1,-2 4,-2 3,0 4,2 4,2"/></g><g transform="translate(5,0)" id="g44"><path id="path46" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 4,9 1,19 4,31 -1,31 C -1,31 -5,23 -5,19 -5,15 0,0 0,0"/></g><g transform="translate(31,0)" id="g48"><path id="path50" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4,9 3,10 -3,12 5,0 C 1,31 5,23 5,19 5,15 0,0 0,0"/></g><g transform="translate(12.541,34.9766)" id="g52"><path id="path54" style="fill:#e2c196;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.143,0.693 -0.822,1.139 -1.517,0.997 l -2.674,-0.554 -2.35,0 c -1.104,0 -2,-0.895 -2,-2 l 0,-1 0,-1.42 5,0 c 0,0 1.899,1.257 1.985,2.345 l 0.362,0.075 0.653,0 c 0,0.074 -0.029,0.144 -0.045,0.217 C -0.142,-1.065 0.112,-0.542 0,0"/></g><g transform="translate(17,34.4199)" id="g56"><path id="path58" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.552 -0.447,1 -1,1 l -6,-1 -5,0 c -0.553,0 -1,-0.448 -1,-1 l 0,-2.42 5,0 2,1 5,1.42 c 0,0 1,0.447 1,1"/></g><g transform="translate(30,35.4199)" id="g60"><path id="path62" style="fill:#e2c196;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2.35,0 -5.024,0.554 C -5.719,0.695 -6.397,0.25 -6.541,-0.443 -6.653,-0.985 -6.399,-1.508 -5.955,-1.784 -5.972,-1.856 -6,-1.926 -6,-2 l 0.653,0 0.363,-0.075 C -4.895,-3.144 -3,-4 -3,-4 l 5,0 0,1 0,1 C 2,-0.896 1.105,0 0,0"/></g><g transform="translate(19,34.4199)" id="g64"><path id="path66" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.552 0.447,1 1,1 l 6,-1 5,0 c 0.553,0 1,-0.448 1,-1 l 0,-2.42 -5,0 -2,1 L 1,-1 c 0,0 -1,0.447 -1,1"/></g><g transform="translate(19,16.5)" id="g68"><path id="path70" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,0 C -2.276,0 -2.5,0.224 -2.5,0.5 -2.5,0.776 -2.276,1 -2,1 L 0,1 C 0.276,1 0.5,0.776 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(14,20)" id="g72"><path id="path74" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.552,3 0,3 0.552,3 1,2.552 1,2 L 1,1 C 1,0.448 0.552,0 0,0"/></g><g transform="translate(22,20)" id="g76"><path id="path78" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.553,3 0,3 0.553,3 1,2.552 1,2 L 1,1 C 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="#FFE51E" d="M19 0c-1.721 0-3.343.406-4.793 1.111C13.814 1.043 13.412 1 13 1 9.134 1 6 4.134 6 8v12h.018C6.201 26.467 11.489 31.656 18 31.656S29.799 26.467 29.982 20H30v-9c0-6.075-4.925-11-11-11z"/><path fill="#9268CA" d="M32 6.625L29 5l-2 1.625s3 7.25 3 11.125S27 27 27 27H9s-3-5.375-3-9.25S9 6.625 9 6.625L7 5 4 6.625S0 13.75 0 17.75 6 36 6 36h24s6-14.25 6-18.25-4-11.125-4-11.125z"/><path fill="#F2D1A1" d="M14 5s-.003 5.308-5 5.936V17c0 3.917 2.507 7.24 6 8.477V28c0 1.657 1.343 3 3 3s3-1.343 3-3v-2.523c3.493-1.237 6-4.56 6-8.477v-5.019C15.89 11.605 14 5 14 5z"/><path fill="#DF1F32" d="M22 21h-8s1 2 4 2 4-2 4-2z"/><path fill="#C1694F" d="M19 19.5h-2c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h2c.276 0 .5.224.5.5s-.224.5-.5.5z"/><path fill="#662113" d="M14 16c-.552 0-1-.448-1-1v-1c0-.552.448-1 1-1s1 .448 1 1v1c0 .552-.448 1-1 1zm8 0c-.553 0-1-.448-1-1v-1c0-.552.447-1 1-1s1 .448 1 1v1c0 .552-.447 1-1 1z"/><path fill="#F2D1A1" d="M19.24 2.396c.042-.521.593-.727 1.146-.708 0 0 5.456.311 7.521 1.271C30.522 4.174 32 6.625 32 6.625h-5S25.917 5.104 25.062 4.5c-.881-.623-4.222-1.215-4.719-1.312s-1.145-.271-1.103-.792zm-2.48 0c-.042-.521-.593-.727-1.146-.708 0 0-5.456.311-7.521 1.271C5.478 4.174 4 6.625 4 6.625h5s1.083-1.521 1.938-2.125c.881-.623 4.222-1.215 4.719-1.312.496-.098 1.145-.271 1.103-.792z"/></svg>
\ No newline at end of file