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/1f936-1f3fb.svg b/public/emoji/1f936-1f3fb.svg
index de4f37f67..0227456d0 100644
--- a/public/emoji/1f936-1f3fb.svg
+++ b/public/emoji/1f936-1f3fb.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(10,11)" id="g20"><path id="path22" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,2.209 -0.896,4 -2,4 -1.104,0 -2,2 -2,-3 0,-2.209 1,-5 3,-5 1.105,0 1,0 1,4"/></g><g transform="translate(26.0029,11)" id="g24"><path id="path26" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,2.209 0.896,4 2,4 3.105,4 4,6 4,1 4,-1.209 3,-4 1,-4 -0.104,-4 0,-4 0,0"/></g><g transform="translate(6,17.4375)" id="g28"><path id="path30" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,8.526 5.373,15.438 12,15.438 18.627,15.438 24,8.526 24,0 24,-9.438 17,-15.438 12,-15.438 7,-15.438 0,-9.438 0,0"/></g><g transform="translate(5,22)" id="g32"><path id="path34" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,2.209 0.896,4 2,4 3.104,4 4,2.209 4,0 4,-2.209 3.104,-4 2,-4 0.896,-4 0,-8 0,0"/></g><g transform="translate(8,15)" id="g36"><path id="path38" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-2.209 -1.119,-4 -2.5,-4 -3.881,-4 -5,-2.209 -5,0 -5,2.21 -3.881,4.001 -2.5,4.001 -1.119,4.001 0,2.21 0,0"/></g><g transform="translate(27,22)" id="g40"><path id="path42" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,2.209 0.896,4 2,4 3.105,4 4,2.209 4,0 4,-4 3.105,-4 2,-4 0.896,-4 0,-2.209 0,0"/></g><g transform="translate(33,15)" id="g44"><path id="path46" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-2.209 -1.119,-4 -2.5,-4 -3.881,-4 -5,-2.209 -5,0 -5,2.21 -3.881,4.001 -2.5,4.001 -1.119,4.001 0,2.21 0,0"/></g><g transform="translate(30.9609,26)" id="g48"><path id="path50" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.016,0.185 0.039,0.368 0.039,0.556 0,5.215 -5.825,9.444 -13.011,9.444 -7.186,0 -13.011,-4.229 -13.011,-9.444 0,-0.188 0.024,-0.371 0.038,-0.556 L 0,0 Z"/></g><g transform="translate(18,5.3486)" id="g52"><path id="path54" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.42,0 -4.274,0.687 -4.352,0.715 -4.869,0.909 -5.13,1.486 -4.936,2.003 -4.742,2.52 -4.167,2.782 -3.65,2.588 -3.634,2.582 -2.04,2 0,2 2.041,2 3.635,2.582 3.65,2.588 4.166,2.782 4.744,2.517 4.936,2.001 5.129,1.484 4.868,0.909 4.352,0.715 4.274,0.687 2.421,0 0,0"/></g><g transform="translate(19,10)" id="g56"><path id="path58" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 c -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 L 0,2 C 0.553,2 1,1.553 1,1 1,0.447 0.553,0 0,0"/></g><g transform="translate(12,13)" id="g60"><path id="path62" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.447 -1,1 l 0,2 C -1,3.553 -0.552,4 0,4 0.552,4 1,3.553 1,3 L 1,1 C 1,0.447 0.552,0 0,0"/></g><g transform="translate(24,13)" id="g64"><path id="path66" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.447 -1,1 l 0,2 C -1,3.553 -0.553,4 0,4 0.553,4 1,3.553 1,3 L 1,1 C 1,0.447 0.553,0 0,0"/></g><g transform="translate(22,25)" id="g68"><path id="path70" style="fill:#f1f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.21 -1.79,-4 -4,-4 -2.21,0 -4,1.79 -4,4 0,2.209 1.79,4 4,4 2.21,0 4,-1.791 4,-4"/></g><g transform="translate(15,24.5)" id="g72"><path id="path74" style="fill:#f1f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.934 -1.566,-3.5 -3.5,-3.5 -5.434,-3.5 -7,-1.934 -7,0 -7,1.934 -5.434,3.5 -3.5,3.5 -1.566,3.5 0,1.934 0,0"/></g><g transform="translate(9,24)" id="g76"><path id="path78" style="fill:#f1f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.343,-3 -3,-3 -1.657,0 -3,1.343 -3,3 0,1.657 1.343,3 3,3 1.657,0 3,-1.343 3,-3"/></g><g transform="translate(28,24.5)" id="g80"><path id="path82" style="fill:#f1f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.934 -1.566,-3.5 -3.5,-3.5 -5.434,-3.5 -7,-1.934 -7,0 -7,1.934 -5.434,3.5 -3.5,3.5 -1.566,3.5 0,1.934 0,0"/></g><g transform="translate(33,24)" id="g84"><path id="path86" style="fill:#f1f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.343,-3 -3,-3 -1.657,0 -3,1.343 -3,3 0,1.657 1.343,3 3,3 1.657,0 3,-1.343 3,-3"/></g><g transform="translate(27,12)" id="g88"><path id="path90" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.104 -1.567,-2 -3.5,-2 -5.433,-2 -7,-1.104 -7,0 -7,1.105 -5.433,2 -3.5,2 -1.567,2 0,1.105 0,0"/></g><g transform="translate(16,12)" id="g92"><path id="path94" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.104 -1.567,-2 -3.5,-2 -5.433,-2 -7,-1.104 -7,0 -7,1.105 -5.433,2 -3.5,2 -1.567,2 0,1.105 0,0"/></g><g transform="translate(33,24)" id="g96"><path id="path98" style="fill:#f1f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.657 -30,1.657 -30,0 0,-1.657 1.343,-3 3,-3 l 24,0 c 1.657,0 3,1.343 3,3"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#D1D3D4" d="M10 25c0-2.209-.896-4-2-4s-2-2-2 3c0 2.209 1 5 3 5 1.104 0 1 0 1-4zm16.003 0c0-2.209.896-4 2-4 1.105 0 2-2 2 3 0 2.209-1 5-3 5-1.105 0-1 0-1-4z"/><path fill="#F7DECE" d="M6 18.562c0-8.526 5.373-15.438 12-15.438s12 6.912 12 15.438C30 28 23 34 18 34S6 28 6 18.562z"/><ellipse fill="#D1D3D4" cx="7" cy="14" rx="2" ry="4"/><path fill="#F7DECE" d="M8 21c0 2.209-1.119 4-2.5 4S3 23.209 3 21s1.119-4 2.5-4S8 18.791 8 21z"/><ellipse fill="#D1D3D4" cx="29" cy="14" rx="2" ry="4"/><path fill="#F7DECE" d="M33 21c0 2.209-1.119 4-2.5 4S28 23.209 28 21s1.119-4 2.5-4 2.5 1.791 2.5 4z"/><path fill="#DD2E44" d="M30.961 10c.016-.185.039-.368.039-.556C31 4.229 25.175 0 17.989 0 10.803 0 4.978 4.229 4.978 9.444c0 .188.024.371.039.556h25.944zM18 30.651c-2.42 0-4.274-.687-4.352-.715-.517-.194-.779-.771-.584-1.288.194-.517.769-.779 1.286-.585.016.006 1.61.588 3.65.588 2.041 0 3.635-.582 3.65-.588.516-.194 1.094.071 1.285.587.193.517-.067 1.092-.584 1.286-.077.029-1.93.715-4.351.715z"/><path fill="#C1694F" d="M19 26h-2c-.553 0-1-.447-1-1s.447-1 1-1h2c.553 0 1 .447 1 1s-.447 1-1 1z"/><path fill="#662113" d="M12 23c-.552 0-1-.447-1-1v-2c0-.553.448-1 1-1s1 .447 1 1v2c0 .553-.448 1-1 1zm12 0c-.553 0-1-.447-1-1v-2c0-.553.447-1 1-1s1 .447 1 1v2c0 .553-.447 1-1 1z"/><circle fill="#F1F2F2" cx="18" cy="11" r="4"/><circle fill="#F1F2F2" cx="11.5" cy="11.5" r="3.5"/><circle fill="#F1F2F2" cx="6" cy="12" r="3"/><circle fill="#F1F2F2" cx="24.5" cy="11.5" r="3.5"/><circle fill="#F1F2F2" cx="30" cy="12" r="3"/><ellipse fill="#D1D3D4" cx="23.5" cy="24" rx="3.5" ry="2"/><ellipse fill="#D1D3D4" cx="12.5" cy="24" rx="3.5" ry="2"/><path fill="#F1F2F2" d="M33 12c0-1.657-30-1.657-30 0s1.343 3 3 3h24c1.657 0 3-1.343 3-3z"/></svg>
\ No newline at end of file