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/1f483.svg b/public/emoji/1f483.svg
index 436f9ae58..33e8827de 100644
--- a/public/emoji/1f483.svg
+++ b/public/emoji/1f483.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(16,35)" id="g20"><path id="path22" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.203,0.378 0.538,0.985 1.806,0.602 3.722,0.022 2,-1 2,-1 c 0,0 2,-1 2,-4 0,-3 -1,-1.838 -1,-5 0,-2 -2,0 -2,0 l -3,-3 c -4,-4 -6,1 -5,3 1,2 0,2 0,4 0,2 2,2 2,4 0,2 2,3 3,3 1,0 2,-1 2,-1"/></g><g transform="translate(12,31)" id="g24"><path id="path26" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.657 1.176,-3 2.625,-3 4.075,-3 5.25,-1.657 5.25,0 5.25,1.657 4.075,3 2.625,3 1.176,3 0,1.657 0,0"/></g><g transform="translate(14.5,35)" id="g28"><path id="path30" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.927,0 -1.727,-0.306 -2.158,-0.755 -3.261,-0.548 -2.636,-2.272 -3.5,-4 c -1,-2 1,-4 1,-3 0,1 0,4 2,4 L 0,-3 c 1.381,0 2.5,0.671 2.5,1.5 C 2.5,-0.671 1.381,0 0,0"/></g><g transform="translate(22.707,25.707)" id="g32"><path id="path34" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.373,0.373 -1.806,1.217 -7.027,1.286 L -7.459,5.169 C -7.52,5.719 -8.021,6.117 -8.563,6.053 -9.112,5.992 -9.508,5.498 -9.447,4.949 l 0.407,-3.656 -4.584,0 -5.918,0.986 c -0.55,0.091 -1.061,-0.278 -1.151,-0.821 -0.091,-0.545 0.277,-1.061 0.821,-1.151 l 6,-1 c 0.055,-0.01 0.11,-0.014 0.165,-0.014 l 2.749,0 c 0.009,-0.262 0.086,-0.588 0.251,-1 1,-2.5 3,-8 3,-8 2.209,0 3,5.015 3,7.5 0,0.603 -0.048,1.06 -0.15,1.407 1.206,-0.088 2.027,-0.223 2.567,-0.351 l -2.217,-2.956 c -0.331,-0.442 -0.242,-1.069 0.2,-1.4 0.18,-0.135 0.39,-0.2 0.599,-0.2 0.305,0 0.604,0.138 0.801,0.4 l 3,4 C 0.392,-0.909 0.352,-0.352 0,0"/></g><g transform="translate(15.9985,3)" id="g36"><path id="path38" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.489,0 -0.917,0.359 -0.988,0.858 l -1,7 c -0.078,0.547 0.301,1.054 0.848,1.132 0.548,0.074 1.054,-0.301 1.131,-0.848 l 1,-7 C 1.069,0.595 0.689,0.088 0.143,0.01 0.095,0.003 0.047,0 0,0"/></g><g transform="translate(15.999,15)" id="g40"><path id="path42" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.472,0 -0.892,0.335 -0.982,0.815 -0.101,0.543 0.256,1.066 0.799,1.167 L 15.816,4.983 C 16.368,5.085 16.883,4.727 16.983,4.184 17.086,3.642 16.729,3.119 16.186,3.017 L 0.185,0.018 C 0.123,0.006 0.061,0 0,0"/></g><g transform="translate(12,23)" id="g44"><path id="path46" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1,-1 1,-3 0,-2 0,-3 -2,-6 -2,-3 -4,-3 -5,-5 -1,-2 0,-2 2,-1 2,1 1,-4 4,-4 3,0 2,3 4,3 2,0 3,-3 5,-3 2,0 2.581,2.419 1,4 -1,1 2,3 3,2 1.581,-1.581 3.236,0.764 1,3 -1,1 -1.789,2.105 0,3 2,1 2.5,5 0,4 -3.344,-1.338 -8,-3.161 -8,0 L 6,1 C 6,1 4,1 4,4 4,4 2.75,0 0.75,4 0.75,4 2,1 0,0"/></g><g transform="translate(16,0)" id="g48"><path id="path50" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.447 -1,1 l 0,3 C -1,4.553 -0.552,5 0,5 0.552,5 1,4.553 1,4 L 1,1 C 1,0.447 0.552,0 0,0"/></g><g transform="translate(32.4287,17.3696)" id="g52"><path id="path54" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.22,0 -0.441,0.072 -0.626,0.221 -1.057,0.568 -1.124,1.197 -0.777,1.628 L 1.004,3.839 C 1.35,4.267 1.979,4.337 2.409,3.99 2.84,3.644 2.907,3.014 2.561,2.584 L 0.779,0.373 C 0.582,0.128 0.293,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 1c.203-.378.538-.985 1.806-.602C19.722.978 18 2 18 2s2 1 2 4-1 1.838-1 5c0 2-2 0-2 0l-3 3c-4 4-6-1-5-3s0-2 0-4 2-2 2-4 2-3 3-3 2 1 2 1z"/><ellipse fill="#FFDC5D" cx="14.625" cy="5" rx="2.625" ry="3"/><path fill="#FFAC33" d="M14.5 1c-.927 0-1.727.306-2.158.755C11.239 1.548 11.864 3.272 11 5c-1 2 1 4 1 3s0-4 2-4h.5c1.381 0 2.5-.671 2.5-1.5S15.881 1 14.5 1z"/><path fill="#FFDC5D" d="M22.707 10.293c-.373-.373-1.806-1.217-7.027-1.286l-.432-3.883c-.061-.549-.562-.948-1.104-.883-.549.061-.944.555-.883 1.104L13.667 9H9.083l-5.918-.986c-.55-.091-1.06.278-1.151.822-.091.544.277 1.06.821 1.15l6 1c.055.01.11.014.165.014h2.749c.009.262.086.588.251 1 1 2.5 3 8 3 8 2.209 0 3-5.015 3-7.5 0-.604-.048-1.06-.15-1.407 1.206.087 2.027.223 2.567.351L18.2 14.4c-.331.442-.242 1.069.2 1.4.18.135.391.2.599.2.305 0 .604-.138.801-.4l3-4c.299-.398.259-.955-.093-1.307zM15.998 33c-.489 0-.917-.359-.988-.858l-1-7c-.078-.547.302-1.054.848-1.132.548-.073 1.054.302 1.131.849l1 7c.078.547-.302 1.054-.848 1.132-.048.006-.095.009-.143.009z"/><path fill="#FFDC5D" d="M15.999 21c-.472 0-.892-.335-.982-.815-.102-.543.256-1.066.799-1.167l15.999-3c.552-.102 1.066.256 1.167.799.103.542-.255 1.065-.798 1.167l-16.001 3c-.061.01-.123.016-.184.016z"/><path fill="#DD2E44" d="M12 13s1 1 1 3 0 3-2 6-4 3-5 5 0 2 2 1 1 4 4 4 2-3 4-3 3 3 5 3 2.581-2.419 1-4c-1-1 2-3 3-2 1.581 1.581 3.236-.764 1-3-1-1-1.789-2.105 0-3 2-1 2.5-5 0-4-3.344 1.338-8 3.161-8 0v-4s-2 0-2-3c0 0-1.25 4-3.25 0 0 0 1.25 3-.75 4z"/><path fill="#DD2E44" d="M16 36c-.552 0-1-.447-1-1v-3c0-.553.448-1 1-1s1 .447 1 1v3c0 .553-.448 1-1 1zm16.429-17.37c-.22 0-.441-.072-.626-.221-.431-.347-.498-.976-.151-1.406l1.781-2.211c.346-.428.975-.498 1.405-.151.431.347.498.976.151 1.406l-1.781 2.211c-.197.245-.486.372-.779.372z"/></svg>
\ No newline at end of file