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/1f468-1f3ff-200d-1f527.svg b/public/emoji/1f468-1f3ff-200d-1f527.svg
index b188a3d21..fac206ffc 100644
--- a/public/emoji/1f468-1f3ff-200d-1f527.svg
+++ b/public/emoji/1f468-1f3ff-200d-1f527.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(36,0)" id="g20"><path id="path22" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,2 c 0,3.314 -2.686,6 -6,6 l -16,0 c -3.313,0 -6,-2.686 -6,-6 l 0,-2 28,0 z"/></g><g transform="translate(17.6396,7.9619)" id="g24"><path id="path26" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.846 8.72,-2.962 8.72,0 l 0,3.749 L 0,3.749 0,0 Z"/></g><g transform="translate(17.6318,10.0273)" id="g28"><path id="path30" style="fill:#664131;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.216,-1.374 2.724,-1.746 4.364,-1.746 1.639,0 3.147,0.373 4.364,1.746 l 0,3.491 L 0,3.491 0,0 Z"/></g><g transform="translate(15.4443,20.0645)" id="g32"><path id="path34" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.734,-2.622 -1.639,-2.622 -0.905,0 -1.639,1.174 -1.639,2.622 0,1.448 0.734,2.623 1.639,2.623 C -0.734,2.623 0,1.448 0,0"/></g><g transform="translate(31.833,20.0645)" id="g36"><path id="path38" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.733,-2.622 -1.639,-2.622 -0.905,0 -1.638,1.174 -1.638,2.622 0,1.448 0.733,2.623 1.638,2.623 C -0.733,2.623 0,1.448 0,0"/></g><g transform="translate(13.4775,19.0405)" id="g40"><path id="path42" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.589 3.816,10.121 8.523,10.121 4.707,0 8.522,-4.532 8.522,-10.121 0,-5.589 -3.815,-10.121 -8.522,-10.121 C 3.816,-10.121 0,-5.589 0,0"/></g><g transform="translate(22,12.1982)" id="g44"><path id="path46" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.754,0 -3.6,0.705 -3.741,0.848 -0.256,0.256 -0.256,0.671 0,0.927 0.248,0.248 0.645,0.254 0.902,0.023 C -2.787,1.761 -2.118,1.311 0,1.311 c 2.2,0 2.836,0.485 2.842,0.49 C 3.098,2.056 3.499,2.044 3.755,1.786 4.011,1.53 3.997,1.104 3.741,0.848 3.6,0.705 2.754,0 0,0"/></g><g transform="translate(22,32.5205)" id="g48"><path id="path50" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 5.648,0 9.178,-4.168 9.178,-7.641 0,-3.473 -0.706,-4.863 -1.412,-3.473 -0.706,1.389 -1.412,2.778 -1.412,2.778 0,0 -4.236,0 -5.648,1.39 0,0 2.118,-4.168 -2.118,0 0,0 0.706,-2.779 -3.53,0.694 0,0 -2.118,-1.389 -2.824,-4.862 -0.196,-0.964 -1.412,0 -1.412,3.473 C -9.178,-4.168 -6.354,0 0,0"/></g><g transform="translate(18,19)" id="g52"><path id="path54" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 C -1,2.55 -0.55,3 0,3 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(26,19)" id="g56"><path id="path58" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 C -1,2.55 -0.55,3 0,3 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(22.75,16.25)" id="g60"><path id="path62" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.5,0 c -0.413,0 -0.75,0.337 -0.75,0.75 0,0.413 0.337,0.75 0.75,0.75 L 0,1.5 C 0.413,1.5 0.75,1.163 0.75,0.75 0.75,0.337 0.413,0 0,0"/></g><path id="path64" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,0 -3,0 0,8 3,0 0,-8 z"/><path id="path66" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 31,0 -3,0 0,8 3,0 0,-8 z"/><g transform="translate(30,5)" id="g68"><path id="path70" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -16,0 -16.875,-5 1,-5 0,0 Z"/></g><g transform="translate(31.0557,26.5)" id="g72"><path id="path74" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.32 -4.092,0 -9,0 -4.909,0 -9,-1.32 -9,0 0,3.547 1,8.5 9,8.5 7,0 9,-4.953 9,-8.5"/></g><g transform="translate(13.1113,26.5)" id="g76"><path id="path78" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.5,-3 1.5,-3 1,0 2.5,2 7.5,2 5,0 6.5,-2 7.5,-2 2,0 1.5,3 1.5,3 C 18,0 16.5,-0.5 9,-0.5 1.5,-0.5 0,0 0,0"/></g><g transform="translate(13.0557,27)" id="g80"><path id="path82" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.5,-3 1.5,-3 1,0 2.5,2 7.5,2 5,0 6.5,-2 7.5,-2 2,0 1.5,3 1.5,3 C 18,0 16.5,-0.5 9,-0.5 1.5,-0.5 0,0 0,0"/></g><g transform="translate(20.5557,34.5)" id="g84"><path id="path86" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0,1.5 1.5,1.5 3,1.5 3,0 3,0 L 0,0 Z"/></g><g transform="translate(30,2.25)" id="g88"><path id="path90" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.69 -1.008,-1.25 -2.25,-1.25 -1.242,0 -2.25,0.56 -2.25,1.25 0,0.69 1.008,1.25 2.25,1.25 C -1.008,1.25 0,0.69 0,0"/></g><g transform="translate(6.9902,16.5186)" id="g92"><path id="path94" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.012,-4.409 c 0,-0.553 -1.006,-1.003 -2.249,-1.005 -1.242,-0.003 -2.25,0.443 -2.252,0.995 l -0.01,4.408 c -1.48,-0.806 -2.494,-2.358 -2.491,-4.164 0.007,-2.622 2.136,-4.746 4.761,-4.74 2.624,0.007 4.746,2.139 4.74,4.762 C 2.506,-2.349 1.484,-0.801 0,0"/></g><path id="path96" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 6.25,0 -3,0 0,8.604 3,0 0,-8.604 z"/></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M36 36v-2c0-3.314-2.686-6-6-6H14c-3.313 0-6 2.686-6 6v2h28z"/><path fill="#7C533E" d="M17.64 28.038c0 2.846 8.72 2.962 8.72 0v-3.749h-8.72v3.749z"/><path fill="#664131" d="M17.632 25.973c1.216 1.374 2.724 1.746 4.364 1.746 1.639 0 3.146-.373 4.363-1.746v-3.491h-8.728v3.491z"/><path fill="#7C533E" d="M15.444 15.936c0 1.448-.734 2.622-1.639 2.622s-1.639-1.174-1.639-2.622.734-2.623 1.639-2.623c.905-.001 1.639 1.174 1.639 2.623m16.389 0c0 1.448-.733 2.622-1.639 2.622-.905 0-1.639-1.174-1.639-2.622s.733-2.623 1.639-2.623c.906-.001 1.639 1.174 1.639 2.623"/><path fill="#7C533E" d="M13.477 16.959c0-5.589 3.816-10.121 8.523-10.121s8.522 4.532 8.522 10.121S26.707 27.08 22 27.08c-4.706 0-8.523-4.531-8.523-10.121"/><path fill="#3D2E24" d="M22 23.802c-2.754 0-3.6-.705-3.741-.848-.256-.256-.256-.671 0-.927.248-.248.646-.255.902-.023.052.037.721.487 2.839.487 2.2 0 2.836-.485 2.842-.49.256-.255.657-.243.913.015.256.256.242.683-.014.938-.141.143-.987.848-3.741.848"/><path fill="#0B0200" d="M22 3.48c5.648 0 9.178 4.168 9.178 7.641s-.706 4.863-1.412 3.473l-1.412-2.778s-4.235 0-5.647-1.39c0 0 2.118 4.168-2.118 0 0 0 .706 2.779-3.53-.694 0 0-2.118 1.389-2.824 4.862-.196.964-1.412 0-1.412-3.473C12.822 7.648 15.646 3.48 22 3.48"/><path d="M18 17c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1m8 0c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1"/><path fill="#3D2E24" d="M22.75 19.75h-1.5c-.413 0-.75-.337-.75-.75s.337-.75.75-.75h1.5c.413 0 .75.337.75.75s-.337.75-.75.75"/><path fill="#269" d="M13 28h3v8h-3zm15 0h3v8h-3z"/><path fill="#269" d="M30 31H14l-.875 5H31z"/><path fill="#3B88C3" d="M31.056 9.5c0 1.32-4.092 0-9 0-4.909 0-9 1.32-9 0 0-3.547 1-8.5 9-8.5 7 0 9 4.953 9 8.5z"/><path fill="#269" d="M13.111 9.5s-.5 3 1.5 3c1 0 2.5-2 7.5-2s6.5 2 7.5 2c2 0 1.5-3 1.5-3s-1.5.5-9 .5-9-.5-9-.5z"/><path fill="#55ACEE" d="M13.056 9s-.5 3 1.5 3c1 0 2.5-2 7.5-2s6.5 2 7.5 2c2 0 1.5-3 1.5-3s-1.5.5-9 .5-9-.5-9-.5z"/><path fill="#269" d="M20.556 1.5s0-1.5 1.5-1.5 1.5 1.5 1.5 1.5h-3z"/><ellipse fill="#F5F8FA" cx="27.75" cy="33.75" rx="2.25" ry="1.25"/><path fill="#66757F" d="M6.99 19.481l.012 4.409c0 .553-1.006 1.003-2.249 1.005-1.242.003-2.25-.443-2.251-.995l-.01-4.408c-1.48.807-2.494 2.359-2.492 4.164.007 2.622 2.137 4.746 4.761 4.74 2.624-.007 4.746-2.139 4.74-4.762-.005-1.804-1.026-3.352-2.511-4.153z"/><path fill="#66757F" d="M3.25 27.396h3V36h-3z"/></svg>
\ No newline at end of file