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/1f44f-1f3fd.svg b/public/emoji/1f44f-1f3fd.svg
index ca3e19e1c..93201cf6b 100644
--- a/public/emoji/1f44f-1f3fd.svg
+++ b/public/emoji/1f44f-1f3fd.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(1.7266,13.7012)" id="g20"><path id="path22" style="fill:#b78b60;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -1.394,1.291 -0.103,2.686 1.291,1.393 2.686,0.101 2.686,0.101 l 6.471,-5.994 c -0.102,0.096 0.45,0.879 0.368,0.955 L 0.44,6.067 c 0,0 -1.394,1.291 -0.103,2.684 1.292,1.394 2.686,0.103 2.686,0.103 l 8.448,-7.825 c -0.02,0.018 0.609,0.731 0.597,0.742 l -9.794,9.072 c 0,0 -1.394,1.291 -0.103,2.685 1.292,1.393 2.686,0.102 2.686,0.102 L 14.65,4.558 c 0.012,-0.01 0.683,0.664 0.703,0.645 l -9.154,8.479 c 0,0 -1.394,1.291 -0.103,2.685 1.292,1.393 2.686,0.102 2.686,0.102 0,0 6.812,-6.31 9.679,-8.965 2.866,-2.655 3.512,-1.958 3.512,-1.958 l -2.588,2.397 -2.989,2.767 c 0,0 -1.394,1.291 -0.102,2.685 1.292,1.395 2.685,0.104 2.685,0.104 l 7.667,-7.102 c 4.618,-4.278 4.895,-11.491 0.616,-16.11 -4.278,-4.619 -11.492,-4.894 -16.111,-0.617 -0.244,0.226 -0.682,0.663 -0.663,0.684 L 10.455,-9.684 0,0 Z"/></g><g transform="translate(4.627,15.6504)" id="g24"><path id="path26" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -1.394,1.291 -0.103,2.685 1.188,4.08 2.582,2.789 2.582,2.789 l 6.472,-5.996 c -0.103,0.096 0.45,0.879 0.368,0.955 L 0.44,6.067 c 0,0 -1.394,1.291 -0.103,2.685 1.291,1.394 2.685,0.103 2.685,0.103 L 11.47,1.029 c -0.019,0.019 0.61,0.731 0.598,0.742 l -9.794,9.073 c 0,0 -1.394,1.29 -0.103,2.684 1.291,1.394 2.685,0.103 2.685,0.103 L 14.649,4.56 c 0.013,-0.012 0.683,0.662 0.703,0.644 l -9.153,8.479 c 0,0 -1.394,1.291 -0.103,2.684 1.291,1.394 2.685,0.103 2.685,0.103 0,0 6.813,-6.311 9.68,-8.966 2.865,-2.654 3.512,-1.957 3.512,-1.957 l -2.589,2.397 -2.988,2.767 c 0,0 -1.393,1.291 -0.103,2.685 1.292,1.394 2.686,0.103 2.686,0.103 l 7.666,-7.101 c 4.619,-4.278 4.895,-11.492 0.617,-16.11 -4.279,-4.619 -11.492,-4.895 -16.111,-0.616 -0.245,0.225 -0.682,0.662 -0.663,0.682 L 10.454,-9.684 0,0 Z"/></g><g transform="translate(24.541,29.5415)" id="g28"><path id="path30" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.213,0 -0.429,0.068 -0.61,0.208 -1.048,0.546 -1.128,1.174 -0.79,1.611 L 2.189,5.466 C 2.524,5.903 3.153,5.985 3.591,5.646 4.028,5.309 4.108,4.681 3.771,4.244 L 0.792,0.389 C 0.596,0.134 0.3,0 0,0"/></g><g transform="translate(19,29)" id="g32"><path id="path34" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,5 C -1,6.552 -0.552,7 0,7 0.553,7 1,6.552 1,6 L 1,1 C 1,0.448 0.553,0 0,0"/></g><g transform="translate(28.417,26.333)" id="g36"><path id="path38" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.408,0 -0.792,0.252 -0.939,0.659 -0.19,0.519 0.079,1.092 0.597,1.281 L 4.241,3.607 C 4.762,3.796 5.334,3.527 5.522,3.009 5.712,2.49 5.443,1.916 4.925,1.727 L 0.342,0.061 C 0.229,0.02 0.113,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#B78B60" d="M32.302 24.347c-.695-1.01-.307-2.47-.48-4.082-.178-2.63-1.308-5.178-3.5-7.216l-7.466-6.942s-1.471-1.369-2.841.103c-1.368 1.471.104 2.84.104 2.84l3.154 2.934 2.734 2.542s-.685.736-3.711-2.078l-10.22-9.506s-1.473-1.368-2.842.104c-1.368 1.471.103 2.84.103 2.84l9.664 8.989c-.021-.02-.731.692-.744.68L5.917 5.938s-1.472-1.369-2.841.103c-1.369 1.472.103 2.84.103 2.84L13.52 18.5c.012.012-.654.764-.634.783l-8.92-8.298s-1.472-1.369-2.841.103c-1.369 1.472.103 2.841.103 2.841l9.484 8.82c.087.081-.5.908-.391 1.009l-6.834-6.356s-1.472-1.369-2.841.104c-1.369 1.472.103 2.841.103 2.841L11.896 30.71c1.861 1.731 3.772 2.607 6.076 2.928.469.065 1.069.065 1.315.096.777.098 1.459.374 2.372.934 1.175.72 2.938 1.02 3.951-.063l3.454-3.695 3.189-3.412c1.012-1.082.831-2.016.049-3.151z"/><path d="M1.956 35.026c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.023 0-1.414L4.8 29.77c.391-.391 1.023-.391 1.414 0s.391 1.023 0 1.414l-3.551 3.55c-.195.195-.451.292-.707.292zm6.746.922c-.109 0-.221-.018-.331-.056-.521-.182-.796-.752-.613-1.274l.971-2.773c.182-.521.753-.795 1.274-.614.521.183.796.753.613 1.274l-.971 2.773c-.144.412-.53.67-.943.67zm-7.667-7.667c-.412 0-.798-.257-.943-.667-.184-.521.089-1.092.61-1.276l2.495-.881c.523-.18 1.092.091 1.276.61.184.521-.089 1.092-.61 1.276l-2.495.881c-.111.039-.223.057-.333.057zm29.46-21.767c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.024 0-1.415l3.552-3.55c.391-.39 1.023-.39 1.414 0s.391 1.024 0 1.415l-3.552 3.55c-.195.196-.451.293-.707.293zm-4.164-1.697c-.109 0-.221-.019-.33-.057-.521-.182-.796-.752-.614-1.274l.97-2.773c.183-.521.752-.796 1.274-.614.521.182.796.752.614 1.274l-.97 2.773c-.144.413-.531.671-.944.671zm6.143 5.774c-.412 0-.798-.257-.943-.667-.184-.521.09-1.092.61-1.276l2.494-.881c.522-.185 1.092.09 1.276.61.184.521-.09 1.092-.61 1.276l-2.494.881c-.111.039-.223.057-.333.057z" fill="#FA743E"/><path fill="#D5AB88" d="M35.39 23.822c-.661-1.032-.224-2.479-.342-4.096-.09-2.634-1.133-5.219-3.255-7.33l-7.228-7.189s-1.424-1.417-2.843.008c-1.417 1.424.008 2.842.008 2.842l3.054 3.039 2.646 2.632s-.71.712-3.639-2.202c-2.931-2.915-9.894-9.845-9.894-9.845s-1.425-1.417-2.843.008c-1.418 1.424.007 2.841.007 2.841l9.356 9.31c-.02-.02-.754.667-.767.654L9.64 4.534s-1.425-1.418-2.843.007c-1.417 1.425.007 2.842.007 2.842l10.011 9.962c.012.012-.68.741-.66.761L7.52 9.513s-1.425-1.417-2.843.008.007 2.843.007 2.843l9.181 9.135c.084.083-.53.891-.425.996l-6.616-6.583s-1.425-1.417-2.843.008.007 2.843.007 2.843l10.79 10.732c1.802 1.793 3.682 2.732 5.974 3.131.467.081 1.067.101 1.311.14.773.124 1.445.423 2.34 1.014 1.15.759 2.902 1.118 3.951.07l3.577-3.576 3.302-3.302c1.049-1.05.9-1.99.157-3.15z"/></svg>
\ No newline at end of file